Skip to content

Commit

Permalink
Move Xcode 16 jobs to the macos-15 runner
Browse files Browse the repository at this point in the history
Xcode 16 will be removed from macos-14 to cut down on the image size:
actions/runner-images#10703
  • Loading branch information
tgoyne committed Oct 9, 2024
1 parent 02860d1 commit 6932ba0
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 81 deletions.
62 changes: 31 additions & 31 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- run: sh -x build.sh verify-osx

osx-16:
runs-on: macos-14
runs-on: macos-15
name: Test osx on Xcode 16
env:
DEVELOPER_DIR: '/Applications/Xcode_16.app/Contents/Developer'
Expand All @@ -55,7 +55,7 @@ jobs:
- run: sh -x build.sh verify-osx

osx-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test osx on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -64,7 +64,7 @@ jobs:
- run: sh -x build.sh verify-osx

osx-encryption-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test osx-encryption on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -82,7 +82,7 @@ jobs:
- run: sh -x build.sh verify-swiftpm

swiftpm-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test swiftpm on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -109,7 +109,7 @@ jobs:
- run: sh -x build.sh verify-swiftpm-debug

swiftpm-debug-16:
runs-on: macos-14
runs-on: macos-15
name: Test swiftpm-debug on Xcode 16
env:
DEVELOPER_DIR: '/Applications/Xcode_16.app/Contents/Developer'
Expand All @@ -118,7 +118,7 @@ jobs:
- run: sh -x build.sh verify-swiftpm-debug

swiftpm-debug-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test swiftpm-debug on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -127,7 +127,7 @@ jobs:
- run: sh -x build.sh verify-swiftpm-debug

swiftpm-address-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test swiftpm-address on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -136,7 +136,7 @@ jobs:
- run: sh -x build.sh verify-swiftpm-address

swiftpm-thread-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test swiftpm-thread on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -154,7 +154,7 @@ jobs:
- run: sh -x build.sh verify-ios-static

ios-static-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test ios-static on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -172,7 +172,7 @@ jobs:
- run: sh -x build.sh verify-ios

ios-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test ios on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -190,7 +190,7 @@ jobs:
- run: sh -x build.sh verify-watchos

watchos-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test watchos on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -208,7 +208,7 @@ jobs:
- run: sh -x build.sh verify-tvos

tvos-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test tvos on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -226,7 +226,7 @@ jobs:
- run: sh -x build.sh verify-visionos

visionos-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test visionos on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -253,7 +253,7 @@ jobs:
- run: sh -x build.sh verify-osx-swift

osx-swift-16:
runs-on: macos-14
runs-on: macos-15
name: Test osx-swift on Xcode 16
env:
DEVELOPER_DIR: '/Applications/Xcode_16.app/Contents/Developer'
Expand All @@ -262,7 +262,7 @@ jobs:
- run: sh -x build.sh verify-osx-swift

osx-swift-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test osx-swift on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -280,7 +280,7 @@ jobs:
- run: sh -x build.sh verify-ios-swift

ios-swift-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test ios-swift on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -298,7 +298,7 @@ jobs:
- run: sh -x build.sh verify-tvos-swift

tvos-swift-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test tvos-swift on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -307,7 +307,7 @@ jobs:
- run: sh -x build.sh verify-tvos-swift

osx-swift-evolution-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test osx-swift-evolution on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -316,7 +316,7 @@ jobs:
- run: sh -x build.sh verify-osx-swift-evolution

ios-swift-evolution-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test ios-swift-evolution on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -325,7 +325,7 @@ jobs:
- run: sh -x build.sh verify-ios-swift-evolution

tvos-swift-evolution-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test tvos-swift-evolution on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -343,7 +343,7 @@ jobs:
- run: sh -x build.sh verify-catalyst

catalyst-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test catalyst on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -361,7 +361,7 @@ jobs:
- run: sh -x build.sh verify-catalyst-swift

catalyst-swift-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test catalyst-swift on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -370,7 +370,7 @@ jobs:
- run: sh -x build.sh verify-catalyst-swift

xcframework-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test xcframework on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -397,7 +397,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-osx

cocoapods-osx-16:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-osx on Xcode 16
env:
DEVELOPER_DIR: '/Applications/Xcode_16.app/Contents/Developer'
Expand All @@ -406,7 +406,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-osx

cocoapods-osx-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-osx on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -415,7 +415,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-osx

cocoapods-ios-static-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-ios-static on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -424,7 +424,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-ios-static

cocoapods-ios-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-ios on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -433,7 +433,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-ios

cocoapods-watchos-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-watchos on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -442,7 +442,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-watchos

cocoapods-tvos-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-tvos on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -451,7 +451,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-tvos

cocoapods-catalyst-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test cocoapods-catalyst on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand All @@ -460,7 +460,7 @@ jobs:
- run: sh -x build.sh verify-cocoapods-catalyst

ios-swiftui-16_1_beta_2:
runs-on: macos-14
runs-on: macos-15
name: Test ios-swiftui on Xcode 16.1_beta_2
env:
DEVELOPER_DIR: '/Applications/Xcode_16.1_beta_2.app/Contents/Developer'
Expand Down
Loading

0 comments on commit 6932ba0

Please sign in to comment.