fix: Upgrade MacOS from 12 to 14 to avoid build failure (#5670)

mac fix attempt
cataclysmbnteam · Nov 4, 2024 · 764d1c0 · 764d1c0
1 parent 38eed6b
commit 764d1c0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
@@ -116,14 +116,14 @@ jobs:
             ext: tar.gz
             content: application/gzip
           - name: osx-curses-x64
-            os: macos-12
+            os: macos-14
             mxe: none
             tiles: 0
             artifact: osx-curses-x64
             ext: dmg
             content: application/x-apple-diskimage
           - name: osx-tiles-x64
-            os: macos-12
+            os: macos-14
             mxe: none
             tiles: 1
             artifact: osx-tiles-x64

diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -109,7 +109,7 @@ jobs:
 
           # - title: Clang 14, macOS 12, Tiles, Sound, Localize, Lua
           #   compiler: clang++
-          #   os: macos-12
+          #   os: macos-14
           #   cmake: 0
           #   tiles: 1
           #   sound: 1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -141,14 +141,14 @@ jobs:
             ext: tar.gz
             content: application/gzip
           - name: osx-curses-x64
-            os: macos-12
+            os: macos-14
             mxe: none
             tiles: 0
             artifact: osx-curses-x64
             ext: dmg
             content: application/x-apple-diskimage
           - name: osx-tiles-x64
-            os: macos-12
+            os: macos-14
             mxe: none
             tiles: 1
             artifact: osx-tiles-x64

diff --git a/build-scripts/gha_compile_only.sh b/build-scripts/gha_compile_only.sh
@@ -57,20 +57,20 @@ then
 
     make -j$num_jobs -C build
 else
-    if [ "$OS" == "macos-12" ]
+    if [ "$OS" == "macos-14" ]
     then
         export NATIVE=osx
         # if OSX_MIN we specify here is lower than 11 then linker is going
         # to throw warnings because uncaught_exceptions, SDL and gettext libraries installed from
         # Homebrew are built with minimum target osx version 11
-        export OSX_MIN=11
+        export OSX_MIN=14
     else
         export BACKTRACE=1
     fi
     make -j "$num_jobs" RELEASE=1 CCACHE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0 FRAMEWORK=1
 
     # For CI on macOS, patch the test binary so it can find SDL2 libraries.
-    if [[ ! -z "$OS" && "$OS" = "macos-12" ]]
+    if [[ ! -z "$OS" && "$OS" = "macos-14" ]]
     then
         file tests/cata_test
         install_name_tool -add_rpath "$HOME"/Library/Frameworks tests/cata_test