From 3123fa375f2453b51dd7d8bef3cdec0d61733391 Mon Sep 17 00:00:00 2001 From: Fons Rademakers Date: Mon, 16 Dec 2024 11:55:27 +0100 Subject: [PATCH] Deprecate macos-12 and add macos-15. --- .github/workflows/macos-ci.yml | 8 -------- .github/workflows/macos-system-ci.yml | 10 +--------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index ae1b95f1f..f829ed6b0 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -27,14 +27,6 @@ jobs: sudo xcode-select -s /Applications/Xcode.app/Contents/Developer if: matrix.os == 'macos-13' - #- name: Make sure Xcode 16.2 is used on macOS 14 as the default /Application/Xcode.app - # shell: bash - # run: | - # sudo mv /Applications/Xcode.app /Applications/Xcode.app- - # sudo ln -s /Applications/Xcode_16.2.app /Applications/Xcode.app - # sudo xcode-select -s /Applications/Xcode.app/Contents/Developer - # if: matrix.os == 'macos-14' - - name: Install dependencies run: | export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 diff --git a/.github/workflows/macos-system-ci.yml b/.github/workflows/macos-system-ci.yml index a08a0912c..57223f43b 100644 --- a/.github/workflows/macos-system-ci.yml +++ b/.github/workflows/macos-system-ci.yml @@ -21,19 +21,11 @@ jobs: build: strategy: matrix: - os: [macos-12, macos-13, macos-14] + os: [macos-13, macos-14, macos-15] runs-on: ${{ matrix.os }} steps: - - name: Make sure Xcode 14.2 is used on macOS 12 as the default /Application/Xcode.app - shell: zsh {0} - run: | - sudo mv /Applications/Xcode.app /Applications/Xcode.app- - sudo ln -s /Applications/Xcode_14.2.app /Applications/Xcode.app - sudo xcode-select -s /Applications/Xcode.app/Contents/Developer - if: matrix.os == 'macos-12' - - name: Make sure Xcode 15.2 is used on macOS 13 as the default /Application/Xcode.app shell: bash run: |