Merge pull request #4863 from Swiftb0y/upgrade-ci-macos11

fix(ci): replace deprecated macos-10.15 with macos-11
mixxxdj · Jul 26, 2022 · 4931f4f · 4931f4f
2 parents e0f8901 + d26e495
commit 4931f4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,8 +55,8 @@ jobs:
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-focal
             qt_qpa_platform: offscreen
-          - name: macOS 10.15
-            os: macos-10.15
+          - name: macOS 11
+            os: macos-11
             cmake_args: >-
               -DBULK=ON
               -DCOREAUDIO=ON
@@ -146,14 +146,14 @@ jobs:
       run: git fetch origin --force --tags
 
     - name: "[macOS/Ubuntu 18.04] Set up cmake"
-      uses: jwlawson/actions-setup-cmake@v1.4
+      uses: jwlawson/actions-setup-cmake@v1.12
       # Ubuntu 20.04 should use the CMake version from the repos, and Visual
       # Studio on Windows comes with its own CMake version anyway.
       if: runner.os == 'macOS' || matrix.os == 'ubuntu-18.04'
       with:
         # This should always match the mininum required version in
         # our CMakeLists.txt
-        cmake-version: '3.16.x'
+        cmake-version: '3.19.x'
 
     - name: "[Windows] Set up MSVC Developer Command Prompt"
       if: runner.os == 'Windows'

diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh
@@ -73,9 +73,9 @@ case "$1" in
             fi
         else
             echo "macOS 10.13 SDK not found, downloading it..."
-            curl -L "https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.13.sdk.tar.xz" -o "${SDKROOT}.tar.xz"
+            curl -L "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz" -o "${SDKROOT}.tar.xz"
             OBSERVED_SHA256=$(shasum -a 256 "${SDKROOT}.tar.xz"|cut -f 1 -d' ')
-            EXPECTED_SHA256="a3a077385205039a7c6f9e2c98ecdf2a720b2a819da715e03e0630c75782c1e4"
+            EXPECTED_SHA256="1d2984acab2900c73d076fbd40750035359ee1abe1a6c61eafcd218f68923a5a"
             if [[ "$OBSERVED_SHA256" == "$EXPECTED_SHA256" ]]; then
                 echo "Download matched expected SHA256 sum $EXPECTED_SHA256"
             else