Skip to content

Commit dced667

Browse files
paulb777paulb777
authored
Xcode_16 will soon require macos-15 in GHA (#13835)
1 parent b63bddd commit dced667

22 files changed

+476
-78
lines changed

‎.github/workflows/abtesting.yml

+44-7
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,25 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
26-
target: [ios, tvos, macos --skip-tests, watchos]
27-
os: [macos-14]
28-
xcode: [Xcode_15.2, Xcode_16]
25+
include:
26+
- os: macos-13
27+
xcode: Xcode_15.2
28+
target: ios
29+
- os: macos-14
30+
xcode: Xcode_15.4
31+
target: ios
32+
- os: macos-15
33+
xcode: Xcode_16
34+
target: ios
35+
- os: macos-15
36+
xcode: Xcode_16
37+
target: tvos
38+
- os: macos-15
39+
xcode: Xcode_16
40+
target: macos
41+
- os: macos-15
42+
xcode: Xcode_16
43+
target: watchos
2944
runs-on: ${{ matrix.os }}
3045
steps:
3146
- uses: actions/checkout@v4
@@ -71,9 +86,31 @@ jobs:
7186
needs: [spm-package-resolved]
7287
strategy:
7388
matrix:
74-
target: [iOS, tvOS, macOS, catalyst, watchOS]
75-
os: [macos-14]
76-
xcode: [Xcode_15.2, Xcode_16]
89+
include:
90+
- os: macos-13
91+
xcode: Xcode_15.2
92+
target: iOS
93+
- os: macos-14
94+
xcode: Xcode_15.4
95+
target: iOS
96+
- os: macos-15
97+
xcode: Xcode_16
98+
target: iOS
99+
- os: macos-15
100+
xcode: Xcode_16
101+
target: tvOS
102+
- os: macos-15
103+
xcode: Xcode_16
104+
target: macOS
105+
- os: macos-15
106+
xcode: Xcode_16
107+
target: watchOS
108+
- os: macos-15
109+
xcode: Xcode_16
110+
target: catalyst
111+
- os: macos-15
112+
xcode: Xcode_16
113+
target: visionOS
77114
runs-on: ${{ matrix.os }}
78115
steps:
79116
- uses: actions/checkout@v4

‎.github/workflows/appdistribution.yml

+15-6
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
target: [ios]
25-
os: [macos-14]
26-
xcode: [Xcode_15.2, Xcode_16]
24+
include:
25+
- os: macos-13
26+
xcode: Xcode_15.2
27+
- os: macos-14
28+
xcode: Xcode_15.4
29+
- os: macos-15
30+
xcode: Xcode_16
2731
runs-on: ${{ matrix.os }}
2832
steps:
2933
- uses: actions/checkout@v4
@@ -35,7 +39,7 @@ jobs:
3539
- name: Build and test
3640
run: |
3741
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
38-
--platforms=${{ matrix.target }}
42+
--platforms=ios
3943
4044
spm-package-resolved:
4145
env:
@@ -66,8 +70,13 @@ jobs:
6670
needs: [spm-package-resolved]
6771
strategy:
6872
matrix:
69-
os: [macos-14]
70-
xcode: [Xcode_15.2, Xcode_16]
73+
include:
74+
- os: macos-13
75+
xcode: Xcode_15.2
76+
- os: macos-14
77+
xcode: Xcode_15.4
78+
- os: macos-15
79+
xcode: Xcode_16
7180
runs-on: ${{ matrix.os }}
7281
steps:
7382
- uses: actions/checkout@v4

‎.github/workflows/auth.yml

+27-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
matrix:
5959
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
6060
target: [ios, tvos, macos --skip-tests --allow-warnings, watchos]
61-
os: [macos-14]
61+
os: [macos-15]
6262
xcode: [Xcode_16]
6363
runs-on: ${{ matrix.os }}
6464
steps:
@@ -107,9 +107,31 @@ jobs:
107107
needs: [spm-package-resolved]
108108
strategy:
109109
matrix:
110-
target: [iOS spm, tvOS spm, macOS spmbuildonly, catalyst spm, watchOS spm]
111-
os: [macos-14]
112-
xcode: [Xcode_15.2, Xcode_16]
110+
include:
111+
- os: macos-13
112+
xcode: Xcode_15.2
113+
target: iOS spm
114+
- os: macos-14
115+
xcode: Xcode_15.4
116+
target: iOS spm
117+
- os: macos-15
118+
xcode: Xcode_16
119+
target: iOS spm
120+
- os: macos-15
121+
xcode: Xcode_16
122+
target: tvOS spm
123+
- os: macos-15
124+
xcode: Xcode_16
125+
target: macOS spmbuildonly
126+
- os: macos-15
127+
xcode: Xcode_16
128+
target: watchOS spm
129+
- os: macos-15
130+
xcode: Xcode_16
131+
target: catalyst spm
132+
- os: macos-15
133+
xcode: Xcode_16
134+
target: visionOS spm
113135
runs-on: ${{ matrix.os }}
114136
steps:
115137
- uses: actions/checkout@v4
@@ -139,7 +161,7 @@ jobs:
139161
env:
140162
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
141163
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
142-
runs-on: macos-14
164+
runs-on: macos-15
143165
steps:
144166
- uses: actions/checkout@v4
145167
- uses: actions/cache/restore@v4

‎.github/workflows/core.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,31 @@ jobs:
6464
needs: [spm-package-resolved]
6565
strategy:
6666
matrix:
67-
target: [iOS, tvOS, macOS, catalyst, watchOS]
68-
os: [macos-14]
69-
xcode: [Xcode_15.2, Xcode_16]
67+
include:
68+
- os: macos-13
69+
xcode: Xcode_15.2
70+
target: iOS
71+
- os: macos-14
72+
xcode: Xcode_15.4
73+
target: iOS
74+
- os: macos-15
75+
xcode: Xcode_16
76+
target: iOS
77+
- os: macos-15
78+
xcode: Xcode_16
79+
target: tvOS
80+
- os: macos-15
81+
xcode: Xcode_16
82+
target: macOS
83+
- os: macos-15
84+
xcode: Xcode_16
85+
target: watchOS
86+
- os: macos-15
87+
xcode: Xcode_16
88+
target: catalyst
89+
- os: macos-15
90+
xcode: Xcode_16
91+
target: visionOS
7092
runs-on: ${{ matrix.os }}
7193
steps:
7294
- uses: actions/checkout@v4

‎.github/workflows/core_internal.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,31 @@ jobs:
6060
needs: [spm-package-resolved]
6161
strategy:
6262
matrix:
63-
target: [iOS, tvOS, macOS, catalyst, watchOS]
64-
os: [macos-14]
65-
xcode: [Xcode_15.2, Xcode_16]
63+
include:
64+
- os: macos-13
65+
xcode: Xcode_15.2
66+
target: iOS
67+
- os: macos-14
68+
xcode: Xcode_15.4
69+
target: iOS
70+
- os: macos-15
71+
xcode: Xcode_16
72+
target: iOS
73+
- os: macos-15
74+
xcode: Xcode_16
75+
target: tvOS
76+
- os: macos-15
77+
xcode: Xcode_16
78+
target: macOS
79+
- os: macos-15
80+
xcode: Xcode_16
81+
target: watchOS
82+
- os: macos-15
83+
xcode: Xcode_16
84+
target: catalyst
85+
- os: macos-15
86+
xcode: Xcode_16
87+
target: visionOS
6688
runs-on: ${{ matrix.os }}
6789
steps:
6890
- uses: actions/checkout@v4

‎.github/workflows/crashlytics.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,31 @@ jobs:
7777
needs: [spm-package-resolved]
7878
strategy:
7979
matrix:
80-
target: [iOS, tvOS, macOS, catalyst, watchOS]
81-
os: [macos-14]
82-
xcode: [Xcode_15.2, Xcode_16]
80+
include:
81+
- os: macos-13
82+
xcode: Xcode_15.2
83+
target: iOS
84+
- os: macos-14
85+
xcode: Xcode_15.4
86+
target: iOS
87+
- os: macos-15
88+
xcode: Xcode_16
89+
target: iOS
90+
- os: macos-15
91+
xcode: Xcode_16
92+
target: tvOS
93+
- os: macos-15
94+
xcode: Xcode_16
95+
target: macOS
96+
- os: macos-15
97+
xcode: Xcode_16
98+
target: watchOS
99+
- os: macos-15
100+
xcode: Xcode_16
101+
target: catalyst
102+
- os: macos-15
103+
xcode: Xcode_16
104+
target: visionOS
83105
runs-on: ${{ matrix.os }}
84106
steps:
85107
- uses: actions/checkout@v4

‎.github/workflows/database.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,31 @@ jobs:
8686
needs: [spm-package-resolved]
8787
strategy:
8888
matrix:
89-
target: [iOS, tvOS, macOS, catalyst, watchOS]
90-
os: [macos-14]
91-
xcode: [Xcode_15.2, Xcode_16]
89+
include:
90+
- os: macos-13
91+
xcode: Xcode_15.2
92+
target: iOS
93+
- os: macos-14
94+
xcode: Xcode_15.4
95+
target: iOS
96+
- os: macos-15
97+
xcode: Xcode_16
98+
target: iOS
99+
- os: macos-15
100+
xcode: Xcode_16
101+
target: tvOS
102+
- os: macos-15
103+
xcode: Xcode_16
104+
target: macOS
105+
- os: macos-15
106+
xcode: Xcode_16
107+
target: watchOS
108+
- os: macos-15
109+
xcode: Xcode_16
110+
target: catalyst
111+
- os: macos-15
112+
xcode: Xcode_16
113+
target: visionOS
92114
runs-on: ${{ matrix.os }}
93115
steps:
94116
- uses: actions/checkout@v4

‎.github/workflows/dynamiclinks.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,13 @@ jobs:
6464
needs: [spm-package-resolved]
6565
strategy:
6666
matrix:
67-
os: [macos-14]
68-
xcode: [Xcode_15.2, Xcode_16]
67+
include:
68+
- os: macos-13
69+
xcode: Xcode_15.2
70+
- os: macos-14
71+
xcode: Xcode_15.4
72+
- os: macos-15
73+
xcode: Xcode_16
6974
runs-on: ${{ matrix.os }}
7075
steps:
7176
- uses: actions/checkout@v4

‎.github/workflows/firebase_app_check.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,31 @@ jobs:
120120
needs: [spm-package-resolved]
121121
strategy:
122122
matrix:
123-
target: [iOS, tvOS, macOS, catalyst, watchOS]
124-
os: [macos-14]
125-
xcode: [Xcode_15.2, Xcode_16]
123+
include:
124+
- os: macos-13
125+
xcode: Xcode_15.2
126+
target: iOS
127+
- os: macos-14
128+
xcode: Xcode_15.4
129+
target: iOS
130+
- os: macos-15
131+
xcode: Xcode_16
132+
target: iOS
133+
- os: macos-15
134+
xcode: Xcode_16
135+
target: tvOS
136+
- os: macos-15
137+
xcode: Xcode_16
138+
target: macOS
139+
- os: macos-15
140+
xcode: Xcode_16
141+
target: watchOS
142+
- os: macos-15
143+
xcode: Xcode_16
144+
target: catalyst
145+
- os: macos-15
146+
xcode: Xcode_16
147+
target: visionOS
126148
runs-on: ${{ matrix.os }}
127149
steps:
128150
- uses: actions/checkout@v4

‎.github/workflows/firestore.yml

+23-4
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ jobs:
405405
- os: macos-13
406406
platforms: 'ios'
407407
include:
408-
- os: macos-14
408+
- os: macos-15
409409
xcode: Xcode_16
410410
- os: macos-13
411411
xcode: Xcode_15.2
@@ -461,9 +461,28 @@ jobs:
461461
(github.event_name == 'pull_request')
462462
strategy:
463463
matrix:
464-
target: [iOS, tvOS, macOS]
465-
os: [macos-14]
466-
xcode: [Xcode_15.2, Xcode_16]
464+
include:
465+
- os: macos-13
466+
xcode: Xcode_15.2
467+
target: iOS
468+
- os: macos-14
469+
xcode: Xcode_15.4
470+
target: iOS
471+
- os: macos-15
472+
xcode: Xcode_16
473+
target: iOS
474+
- os: macos-15
475+
xcode: Xcode_16
476+
target: tvOS
477+
- os: macos-15
478+
xcode: Xcode_16
479+
target: macOS
480+
- os: macos-15
481+
xcode: Xcode_16
482+
target: catalyst
483+
- os: macos-15
484+
xcode: Xcode_16
485+
target: visionOS
467486
runs-on: ${{ matrix.os }}
468487
env:
469488
FIREBASE_SOURCE_FIRESTORE: 1

0 commit comments

Comments
 (0)