From 2d5a49faf7b5b6c137b4004b5381abec836dd32a Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sun, 8 Sep 2024 09:35:51 +0200 Subject: [PATCH] Upgrade GitHub Actions CI to macOS 14 ahead of deprecation (#22601) * Upgrade GitHub Actions CI to macOS 14 ahead of deprecation * Only run macOS tests on the now-native arm64 platform --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dddae13f1..2edb2fa2b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,23 +190,23 @@ jobs: if-no-files-found: error macos-cmake: name: macOS (${{ matrix.arch }}) using CMake - runs-on: macos-12 + runs-on: macos-14 needs: check-code-formatting strategy: fail-fast: false matrix: arch: [x64, arm64] include: - - arch: x64 - cache_key: macos-x64 + - arch: arm64 + cache_key: macos-arm64 # Note: only build/run tests on the native architecture of the CI agent # GitHub macos-12 agents are all Intel, but as of 2024-04-25 new images, e.g. macos-14 (current macos-latest) are arm64 # See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories - build_flags: -DARCH="x86_64" -DWITH_TESTS=on + build_flags: -DARCH="arm64" -DWITH_TESTS=on run_tests: true - - arch: arm64 - cache_key: macos-arm64 - build_flags: -DARCH="arm64" + - arch: x64 + cache_key: macos-x64 + build_flags: -DARCH="x86_64" run_tests: false steps: - name: Checkout @@ -249,7 +249,7 @@ jobs: if: ${{matrix.run_tests}} macos-universal: name: macOS universal app bundle - runs-on: macos-12 + runs-on: macos-14 needs: macos-cmake steps: - name: Checkout