Skip to content

Commit

Permalink
ci: upgrade x86-64 macOS runners macos-11 -> macos-13
Browse files Browse the repository at this point in the history
The macos-11 runners are deprecated. Let's modernize.

This also gets us on the same macOS SDK as the ARM runners.
  • Loading branch information
indygreg committed Feb 19, 2024
1 parent 7ec4b05 commit 2e11c03
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/apple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- cron: '13 11 * * *'
jobs:
pythonbuild:
runs-on: 'macos-11'
runs-on: 'macos-13'
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -130,87 +130,87 @@ jobs:
# noopt because it doesn't provide any compelling advantages over PGO
# or LTO builds.
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.8'
optimizations: 'debug'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.8'
optimizations: 'lto'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.8'
optimizations: 'pgo'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.8'
optimizations: 'pgo+lto'

- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.9'
optimizations: 'debug'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.9'
optimizations: 'lto'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.9'
optimizations: 'pgo'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.9'
optimizations: 'pgo+lto'

- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.10'
optimizations: 'debug'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.10'
optimizations: 'lto'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.10'
optimizations: 'pgo'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.10'
optimizations: 'pgo+lto'

- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.11'
optimizations: 'debug'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.11'
optimizations: 'lto'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.11'
optimizations: 'pgo'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.11'
optimizations: 'pgo+lto'

- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.12'
optimizations: 'debug'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.12'
optimizations: 'lto'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.12'
optimizations: 'pgo'
- target_triple: 'x86_64-apple-darwin'
runner: macos-11
runner: macos-13
py: 'cpython-3.12'
optimizations: 'pgo+lto'
needs:
Expand All @@ -237,7 +237,7 @@ jobs:
if [ "${{ matrix.build.target_triple }}" = "aarch64-apple-darwin" ]; then
export APPLE_SDK_PATH=/Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
elif [ "${{ matrix.build.target_triple }}" = "x86_64-apple-darwin" ]; then
export APPLE_SDK_PATH=/Applications/Xcode_12.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
export APPLE_SDK_PATH=/Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
else
echo "unhandled target triple: ${{ matrix.build.target_triple }}"
exit 1
Expand Down

0 comments on commit 2e11c03

Please sign in to comment.