Skip to content

Commit

Permalink
Merge pull request #17838 from github/oscarsj/deprecate-macos-12
Browse files Browse the repository at this point in the history
Remove macos-12 and its variants, deprecated
  • Loading branch information
oscarsj authored Oct 28, 2024
2 parents 655fa53 + 8f7ed21 commit 3e77629
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-ripunzip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-12, windows-2019]
os: [ubuntu-20.04, macos-13, windows-2019]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-13-xlarge
steps:
- uses: actions/checkout@v4
- uses: ./swift/actions/build-and-test
Expand All @@ -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-13-xlarge
steps:
- uses: actions/checkout@v4
- uses: ./swift/actions/run-ql-tests
Expand Down
4 changes: 1 addition & 3 deletions docs/codeql/reusables/supported-platforms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 3e77629

Please sign in to comment.