Skip to content

Commit f3fdc71

Browse files
andrewheardandrewheard
committed
Merge remote-tracking branch 'origin/main' into version-11.6
2 parents 13a0841 + 9adc6ed commit f3fdc71

File tree

10 files changed

+95
-77
lines changed

10 files changed

+95
-77
lines changed

‎.github/workflows/crashlytics.yml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,23 @@ jobs:
2525
strategy:
2626
matrix:
2727
target: [ios, tvos, macos, watchos --skip-tests]
28-
os: [macos-14]
2928
flags: [
3029
'--use-modular-headers --skip-tests',
3130
''
3231
]
33-
xcode: [Xcode_15.2, Xcode_16]
34-
runs-on: ${{ matrix.os }}
32+
build-env:
33+
- os: macos-14
34+
xcode: Xcode_15.2
35+
- os: macos-15
36+
xcode: Xcode_16.1
37+
runs-on: ${{ matrix.build-env.os }}
3538
steps:
3639
- uses: actions/checkout@v4
3740
- uses: ruby/setup-ruby@v1
3841
- name: Setup Bundler
3942
run: scripts/setup_bundler.sh
4043
- name: Xcode
41-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
44+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
4245
- uses: nick-fields/retry@v3
4346
with:
4447
timeout_minutes: 120
@@ -85,22 +88,22 @@ jobs:
8588
xcode: Xcode_15.4
8689
target: iOS
8790
- os: macos-15
88-
xcode: Xcode_16
91+
xcode: Xcode_16.1
8992
target: iOS
9093
- os: macos-15
91-
xcode: Xcode_16
94+
xcode: Xcode_16.1
9295
target: tvOS
9396
- os: macos-15
94-
xcode: Xcode_16
97+
xcode: Xcode_16.1
9598
target: macOS
9699
- os: macos-15
97-
xcode: Xcode_16
100+
xcode: Xcode_16.1
98101
target: watchOS
99102
- os: macos-15
100-
xcode: Xcode_16
103+
xcode: Xcode_16.1
101104
target: catalyst
102105
- os: macos-15
103-
xcode: Xcode_16
106+
xcode: Xcode_16.1
104107
target: visionOS
105108
runs-on: ${{ matrix.os }}
106109
steps:
@@ -149,7 +152,7 @@ jobs:
149152
env:
150153
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
151154
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
152-
runs-on: macos-14
155+
runs-on: macos-15
153156
steps:
154157
- uses: actions/checkout@v4
155158
- uses: ruby/setup-ruby@v1

‎.github/workflows/dynamiclinks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
env:
115115
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
116116
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
117-
runs-on: macos-14
117+
runs-on: macos-15
118118
steps:
119119
- uses: actions/checkout@v4
120120
- uses: ruby/setup-ruby@v1

‎.github/workflows/inappmessaging.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,17 @@ jobs:
2424
strategy:
2525
matrix:
2626
podspec: [FirebaseInAppMessaging.podspec]
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: Xcode
34-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
37+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3538
- name: Setup Bundler
3639
run: scripts/setup_bundler.sh
3740
- name: FirebaseInAppMessaging
@@ -97,7 +100,7 @@ jobs:
97100
- os: macos-14
98101
xcode: Xcode_15.4
99102
- os: macos-15
100-
xcode: Xcode_16
103+
xcode: Xcode_16.1
101104
runs-on: ${{ matrix.os }}
102105
steps:
103106
- uses: actions/checkout@v4
@@ -139,7 +142,7 @@ jobs:
139142
env:
140143
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
141144
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
142-
runs-on: macos-14
145+
runs-on: macos-15
143146

144147
steps:
145148
- uses: actions/checkout@v4

‎.github/workflows/installations.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ jobs:
2525
matrix:
2626
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
2727
target: [ios, tvos, macos --skip-tests, watchos]
28-
os: [macos-14]
29-
include:
28+
build-env:
3029
- os: macos-14
31-
xcode: Xcode_15.3
30+
xcode: Xcode_15.2
3231
test-specs: unit,integration
33-
- os: macos-14
34-
xcode: Xcode_16
32+
- os: macos-15
33+
xcode: Xcode_16.1
3534
test-specs: unit
36-
runs-on: ${{ matrix.os }}
35+
runs-on: ${{ matrix.build-env.os }}
3736
steps:
3837
- uses: actions/checkout@v4
3938
- uses: ruby/setup-ruby@v1
@@ -50,12 +49,12 @@ jobs:
5049
id: secrets
5150
run: echo "::set-output name=val::$([[ -z $plist_secret ]] && echo "0" || echo "1")"
5251
- name: Xcode
53-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
52+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
5453
- name: Build and test
5554
run: |
5655
export FIS_INTEGRATION_TESTS_REQUIRED=${{ steps.secrets.outputs.val }}
5756
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseInstallations.podspec \
58-
--platforms=${{ matrix.target }} --test-specs=${{ matrix.test-specs }}
57+
--platforms=${{ matrix.target }} --test-specs=${{ matrix.build-env.test-specs }}
5958
6059
spm-package-resolved:
6160
env:
@@ -93,22 +92,22 @@ jobs:
9392
xcode: Xcode_15.4
9493
target: iOS
9594
- os: macos-15
96-
xcode: Xcode_16
95+
xcode: Xcode_16.1
9796
target: iOS
9897
- os: macos-15
99-
xcode: Xcode_16
98+
xcode: Xcode_16.1
10099
target: tvOS
101100
- os: macos-15
102-
xcode: Xcode_16
101+
xcode: Xcode_16.1
103102
target: macOS
104103
- os: macos-15
105-
xcode: Xcode_16
104+
xcode: Xcode_16.1
106105
target: watchOS
107106
- os: macos-15
108-
xcode: Xcode_16
107+
xcode: Xcode_16.1
109108
target: catalyst
110109
- os: macos-15
111-
xcode: Xcode_16
110+
xcode: Xcode_16.1
112111
target: visionOS
113112
runs-on: ${{ matrix.os }}
114113
steps:

‎.github/workflows/remoteconfig.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,27 @@ jobs:
6262
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
6363
target: [ios, tvos, macos --skip-tests, watchos]
6464
podspec: [FirebaseRemoteConfig.podspec]
65-
os: [macos-14]
66-
include:
65+
build-env:
6766
- os: macos-14
6867
xcode: Xcode_15.3
6968
# TODO(#13078): Fix testing infra to enforce warnings again.
7069
tests: --allow-warnings
7170
# Flaky tests on CI
72-
- os: macos-14
73-
xcode: Xcode_16
71+
- os: macos-15
72+
xcode: Xcode_16.1
7473
tests: --skip-tests
75-
runs-on: ${{ matrix.os }}
74+
runs-on: ${{ matrix.build-env.os }}
7675
steps:
7776
- uses: actions/checkout@v4
7877
- uses: ruby/setup-ruby@v1
7978
- name: Setup Bundler
8079
run: scripts/setup_bundler.sh
8180
- name: Xcode
82-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
81+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
8382
- name: Build and test
8483
run: |
8584
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} \
86-
${{ matrix.tests }}
85+
${{ matrix.build-env.tests }}
8786
8887
spm-package-resolved:
8988
env:
@@ -124,27 +123,27 @@ jobs:
124123
target: iOS
125124
test: spm
126125
- os: macos-15
127-
xcode: Xcode_16
126+
xcode: Xcode_16.1
128127
target: iOS
129128
test: spm
130129
- os: macos-15
131-
xcode: Xcode_16
130+
xcode: Xcode_16.1
132131
target: tvOS
133132
test: spm
134133
- os: macos-15
135-
xcode: Xcode_16
134+
xcode: Xcode_16.1
136135
target: macOS
137136
test: spm
138137
- os: macos-15
139-
xcode: Xcode_16
138+
xcode: Xcode_16.1
140139
target: watchOS
141140
test: spmbuildonly
142141
- os: macos-15
143-
xcode: Xcode_16
142+
xcode: Xcode_16.1
144143
target: catalyst
145144
test: spm
146145
- os: macos-15
147-
xcode: Xcode_16
146+
xcode: Xcode_16.1
148147
target: visionOS
149148
test: spm
150149
runs-on: ${{ matrix.os }}
@@ -184,7 +183,7 @@ jobs:
184183
env:
185184
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
186185
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
187-
runs-on: macos-14
186+
runs-on: macos-15
188187
steps:
189188
- uses: actions/checkout@v4
190189
- uses: ruby/setup-ruby@v1

‎.github/workflows/sessions.yml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,29 @@ jobs:
2424
strategy:
2525
matrix:
2626
target: [ios, tvos, macos, watchos]
27-
os: [macos-14]
28-
include:
27+
build-env:
2928
- os: macos-14
3029
xcode: Xcode_15.3
3130
tests:
3231
# Flaky tests on CI
33-
- os: macos-14
34-
xcode: Xcode_16
32+
- os: macos-15
33+
xcode: Xcode_16.1
3534
tests: --skip-tests
36-
runs-on: ${{ matrix.os }}
35+
runs-on: ${{ matrix.build-env.os }}
3736
steps:
3837
- uses: actions/checkout@v4
3938
- uses: ruby/setup-ruby@v1
4039
- name: Setup Bundler
4140
run: scripts/setup_bundler.sh
4241
- name: Xcode
43-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
42+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
4443
- uses: nick-fields/retry@v3
4544
with:
4645
timeout_minutes: 120
4746
max_attempts: 3
4847
retry_on: error
4948
retry_wait_seconds: 120
50-
command: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseSessions.podspec --platforms=${{ matrix.target }} ${{ matrix.tests }}
49+
command: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseSessions.podspec --platforms=${{ matrix.target }} ${{ matrix.build-env.tests }}
5150

5251
spm-package-resolved:
5352
env:
@@ -86,22 +85,22 @@ jobs:
8685
xcode: Xcode_15.4
8786
target: iOS
8887
- os: macos-15
89-
xcode: Xcode_16
88+
xcode: Xcode_16.1
9089
target: iOS
9190
- os: macos-15
92-
xcode: Xcode_16
91+
xcode: Xcode_16.1
9392
target: tvOS
9493
- os: macos-15
95-
xcode: Xcode_16
94+
xcode: Xcode_16.1
9695
target: macOS
9796
- os: macos-15
98-
xcode: Xcode_16
97+
xcode: Xcode_16.1
9998
target: watchOS
10099
- os: macos-15
101-
xcode: Xcode_16
100+
xcode: Xcode_16.1
102101
target: catalyst
103102
- os: macos-15
104-
xcode: Xcode_16
103+
xcode: Xcode_16.1
105104
target: visionOS
106105
runs-on: ${{ matrix.os }}
107106
steps:

‎.github/workflows/storage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ jobs:
139139
#- os: macos-13
140140
# xcode: Xcode_14.2 # TODO: the legacy ObjC quickstart doesn't build with Xcode 15.
141141
- swift: swift
142-
os: macos-14
143-
xcode: Xcode_15.3
142+
os: macos-15
143+
xcode: Xcode_16.1
144144
env:
145145
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
146146
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

0 commit comments

Comments
 (0)