Skip to content

Commit 5e8199f

Browse files
authored
[Infra] Update shared-swift workflow to use macOS 15 for Xcode 16 (#14088)
1 parent 45db5d1 commit 5e8199f

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/shared-swift.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,19 @@ jobs:
2424
strategy:
2525
matrix:
2626
target: [ios, tvos, macos, watchos]
27-
os: [macos-14]
28-
xcode: [Xcode_15.2, Xcode_16]
29-
runs-on: ${{ matrix.os }}
27+
build-env:
28+
- os: macos-14
29+
xcode: Xcode_15.2
30+
- os: macos-15
31+
xcode: Xcode_16.1
32+
runs-on: ${{ matrix.build-env.os }}
3033
steps:
3134
- uses: actions/checkout@v4
3235
- uses: ruby/setup-ruby@v1
3336
- name: Setup Bundler
3437
run: scripts/setup_bundler.sh
3538
- name: Xcode
36-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
39+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3740
- name: Build and test
3841
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseSharedSwift.podspec --platforms=${{ matrix.target }}
3942

@@ -67,17 +70,20 @@ jobs:
6770
strategy:
6871
matrix:
6972
target: [iOS, tvOS, macOS, catalyst, watchOS]
70-
os: [macos-14]
71-
xcode: [Xcode_15.2, Xcode_16]
72-
runs-on: ${{ matrix.os }}
73+
build-env:
74+
- os: macos-14
75+
xcode: Xcode_15.2
76+
- os: macos-15
77+
xcode: Xcode_16.1
78+
runs-on: ${{ matrix.build-env.os }}
7379
steps:
7480
- uses: actions/checkout@v4
7581
- uses: actions/cache/restore@v4
7682
with:
7783
path: .build
7884
key: ${{needs.spm-package-resolved.outputs.cache_key}}
7985
- name: Xcode
80-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
86+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
8187
- name: Initialize xcodebuild
8288
run: scripts/setup_spm_tests.sh
8389
- name: Unit Tests

0 commit comments

Comments
 (0)