Skip to content

Commit dbdfdc4

Browse files
authored
[Infra] Update messaging workflow to use macOS 15 for Xcode 16 (#14089)
1 parent 5e8199f commit dbdfdc4

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

.github/workflows/messaging.yml

+14-15
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,23 @@ jobs:
5959
matrix:
6060
podspec: [FirebaseMessagingInterop.podspec, FirebaseMessaging.podspec]
6161
target: [ios, tvos, macos --skip-tests, watchos --skip-tests] # skipping tests on mac because of keychain access
62-
os: [macos-14]
63-
include:
62+
build-env:
6463
- os: macos-14
6564
xcode: Xcode_15.3
6665
tests: --test-specs=unit
67-
- os: macos-14
68-
xcode: Xcode_16
66+
- os: macos-15
67+
xcode: Xcode_16.1
6968
tests: --skip-tests
70-
runs-on: ${{ matrix.os }}
69+
runs-on: ${{ matrix.build-env.os }}
7170
steps:
7271
- uses: actions/checkout@v4
7372
- uses: ruby/setup-ruby@v1
7473
- name: Setup Bundler
7574
run: scripts/setup_bundler.sh
7675
- name: Xcode
77-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
76+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
7877
- name: Build and test
79-
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} ${{ matrix.tests }} --platforms=${{ matrix.target }}
78+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} ${{ matrix.build-env.tests }} --platforms=${{ matrix.target }}
8079

8180
spm-package-resolved:
8281
env:
@@ -115,22 +114,22 @@ jobs:
115114
xcode: Xcode_15.4
116115
target: iOS spmbuildonly
117116
- os: macos-15
118-
xcode: Xcode_16
117+
xcode: Xcode_16.1
119118
target: iOS spm
120119
- os: macos-15
121-
xcode: Xcode_16
120+
xcode: Xcode_16.1
122121
target: tvOS spmbuildonly
123122
- os: macos-15
124-
xcode: Xcode_16
123+
xcode: Xcode_16.1
125124
target: macOS spmbuildonly
126125
- os: macos-15
127-
xcode: Xcode_16
126+
xcode: Xcode_16.1
128127
target: watchOS spmbuildonly
129128
- os: macos-15
130-
xcode: Xcode_16
129+
xcode: Xcode_16.1
131130
target: catalyst spmbuildonly
132131
- os: macos-15
133-
xcode: Xcode_16
132+
xcode: Xcode_16.1
134133
target: visionOS spmbuildonly
135134
runs-on: ${{ matrix.os }}
136135
steps:
@@ -170,8 +169,8 @@ jobs:
170169
strategy:
171170
matrix:
172171
include:
173-
- os: macos-14
174-
xcode: Xcode_15.3
172+
- os: macos-15
173+
xcode: Xcode_16.1
175174
runs-on: ${{ matrix.os }}
176175
steps:
177176
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)