use macos-12 runner, MACOSX_DEPLOYMENT_TARGET=11.0 as of qt 6.5

spatial-model-editor · Jul 11, 2023 · 5415b24 · 5415b24
1 parent 8cbb3f8
commit 5415b24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,11 +45,11 @@ jobs:
 
   macos:
     name: MacOS
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       INSTALL_PREFIX: "/opt/smelibs"
       SUDO_CMD: "sudo"
-      MACOSX_DEPLOYMENT_TARGET: "10.14"
+      MACOSX_DEPLOYMENT_TARGET: "11.0"
       CONFIGURE_EXTRAS: ""
       OS: "osx"
     defaults:

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ and used instead of the bundled Qt version (does not apply to msvc builds)
 Get the latest versions here:
 
 - linux (clang 16 / Ubuntu 20.04): [sme_deps_qt_linux.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_linux.tgz)
-- osx (Apple clang 13 / macOS 11): [sme_deps_qt_osx.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_osx.tgz)
+- osx (Apple clang 14 / macOS 12 / MACOSX_DEPLOYMENT_TARGET 11.0): [sme_deps_qt_osx.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_osx.tgz)
 - win32-mingw (mingw-w64-i686-gcc 13): [sme_deps_qt_win32-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win32-mingw.tgz)
 - win64-mingw (mingw-w64-x86_64-gcc 13): [sme_deps_qt_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win64-mingw.tgz)
 - win32-msvc (VC++ 2015 Toolset): [sme_deps_qt_win32-msvc.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win32-msvc.tgz)

diff --git a/build.sh b/build.sh
@@ -5,6 +5,7 @@ set -e -x
 echo "QT_VERSION = $QT_VERSION"
 echo "ZLIB_VERSION: ${ZLIB_VERSION}"
 echo "INSTALL_PREFIX = $INSTALL_PREFIX"
+echo "MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET"
 echo "SUDO_CMD = $SUDO_CMD"
 echo "CONFIGURE_EXTRAS = $CONFIGURE_EXTRAS"
 echo "OS=$OS"
@@ -22,7 +23,7 @@ cd zlib
 mkdir build
 cd build
 cmake -G "Ninja" .. \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_C_FLAGS="-fpic -fvisibility=hidden" \