From a467923e9b3c5d7966afaba8ca6162be282893be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= Date: Thu, 24 Oct 2024 18:57:58 +0200 Subject: [PATCH 1/3] Remove macos-12 and its variants, deprecated --- .github/workflows/build-ripunzip.yml | 2 +- .github/workflows/swift.yml | 4 ++-- docs/codeql/reusables/supported-platforms.rst | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ripunzip.yml b/.github/workflows/build-ripunzip.yml index aed80bac6695..956c36ba3fcb 100644 --- a/.github/workflows/build-ripunzip.yml +++ b/.github/workflows/build-ripunzip.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-12, windows-2019] + os: [ubuntu-20.04, macos-14, windows-2019] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index ad7e8f52aa35..7f555c2b5031 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -44,7 +44,7 @@ jobs: # without waiting for the macOS build build-and-test-macos: if: github.repository_owner == 'github' - runs-on: macos-12-xl + runs-on: macos-14-xlarge steps: - uses: actions/checkout@v4 - uses: ./swift/actions/build-and-test @@ -64,7 +64,7 @@ jobs: qltests-macos: if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }} needs: build-and-test-macos - runs-on: macos-12-xl + runs-on: macos-14-xlarge steps: - uses: actions/checkout@v4 - uses: ./swift/actions/run-ql-tests diff --git a/docs/codeql/reusables/supported-platforms.rst b/docs/codeql/reusables/supported-platforms.rst index 02dccb61c7e9..fd6ca4f220f6 100644 --- a/docs/codeql/reusables/supported-platforms.rst +++ b/docs/codeql/reusables/supported-platforms.rst @@ -12,9 +12,7 @@ Windows,"Windows 10 / Windows Server 2019 Windows 11 / Windows Server 2022","x86-64" - macOS,"macOS 12 Monterey - - macOS 13 Ventura + macOS,"macOS 13 Ventura macOS 14 Sonoma","x86-64, arm64 (Apple Silicon) From c2a644b7400d93f7638b181d42d0e1eb33b7d846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= Date: Fri, 25 Oct 2024 12:20:25 +0200 Subject: [PATCH 2/3] Update macOS version in build workflow --- .github/workflows/build-ripunzip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ripunzip.yml b/.github/workflows/build-ripunzip.yml index 956c36ba3fcb..e7218a40e664 100644 --- a/.github/workflows/build-ripunzip.yml +++ b/.github/workflows/build-ripunzip.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-14, windows-2019] + os: [ubuntu-20.04, macos-13, windows-2019] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 8f7ed21f5dc9703216bf99358a84e54ea719d967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= Date: Fri, 25 Oct 2024 12:21:27 +0200 Subject: [PATCH 3/3] Update macOS version in workflow file --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 7f555c2b5031..174ff08183e2 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -44,7 +44,7 @@ jobs: # without waiting for the macOS build build-and-test-macos: if: github.repository_owner == 'github' - runs-on: macos-14-xlarge + runs-on: macos-13-xlarge steps: - uses: actions/checkout@v4 - uses: ./swift/actions/build-and-test @@ -64,7 +64,7 @@ jobs: qltests-macos: if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }} needs: build-and-test-macos - runs-on: macos-14-xlarge + runs-on: macos-13-xlarge steps: - uses: actions/checkout@v4 - uses: ./swift/actions/run-ql-tests