Skip to content

Commit 5663aa0

Browse files
ncooke3ncooke3
authored
fix(ci): Resolve Xcode version issues for messaging and (pre)release workflows (#15227)
1 parent e2a3c3f commit 5663aa0

File tree

3 files changed

+50
-11
lines changed

3 files changed

+50
-11
lines changed

‎.github/workflows/messaging.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ jobs:
178178
with:
179179
cache_key: sample${{ matrix.os }}
180180
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
181+
- name: Xcode
182+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
181183
- name: Setup Bundler
182184
run: scripts/setup_bundler.sh
183185
- name: Install Secret GoogleService-Info.plist
@@ -186,8 +188,6 @@ jobs:
186188
FirebaseMessaging/Apps/Shared/GoogleService-Info.plist "$plist_secret"
187189
- name: Prereqs
188190
run: scripts/install_prereqs.sh MessagingSample iOS
189-
- name: Xcode
190-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
191191
- name: Build
192192
run: ([ -z $plist_secret ] || scripts/build.sh MessagingSample iOS)
193193

‎.github/workflows/prerelease.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
uses: actions/checkout@v4
3636
with:
3737
fetch-depth: 0
38+
- name: Xcode
39+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
3840
- name: Generate matrix
3941
id: generate_matrix
4042
run: |
@@ -80,6 +82,7 @@ jobs:
8082
path: |
8183
*.podspec
8284
*.podspec.json
85+
8386
buildup_SpecsTesting_repo_FirebaseCore:
8487
needs: specs_checking
8588
# Don't run on private repo unless it is a PR.
@@ -92,6 +95,8 @@ jobs:
9295
targeted_pod: FirebaseCore
9396
steps:
9497
- uses: actions/checkout@v4
98+
- name: Xcode
99+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
95100
- uses: actions/download-artifact@v4.1.7
96101
with:
97102
name: firebase-ios-sdk
@@ -127,10 +132,17 @@ jobs:
127132
targeted_pod: ${{ matrix.podspec }}
128133
steps:
129134
- uses: actions/checkout@v4
135+
- name: Xcode
136+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
130137
- uses: actions/download-artifact@v4.1.7
131138
with:
132139
name: firebase-ios-sdk
133140
path: ${{ env.local_sdk_repo_dir }}
141+
# Addresses flaky pushes due to missing git config on runner.
142+
- name: Set git config
143+
run: |
144+
git config --global user.email "google-oss-bot@example.com"
145+
git config --global user.name "google-oss-bot"
134146
- name: Update SpecsTesting repo
135147
run: |
136148
[[ ${{ matrix.allowwarnings }} == true ]] && ALLOWWARNINGS=true
@@ -163,6 +175,8 @@ jobs:
163175
- uses: actions/checkout@v4
164176
with:
165177
fetch-depth: 0
178+
- name: Xcode
179+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
166180
- name: Update SpecsTesting repo setup
167181
run: |
168182
# Update/create a nightly tag to the head of the main branch.
@@ -207,6 +221,8 @@ jobs:
207221
steps:
208222
- uses: actions/checkout@v4
209223
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
224+
- name: Xcode
225+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
210226
- name: Setup testing repo and quickstart
211227
env:
212228
LEGACY: true
@@ -273,6 +289,8 @@ jobs:
273289
steps:
274290
- uses: actions/checkout@v4
275291
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
292+
- name: Xcode
293+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
276294
- name: Setup testing repo and quickstart
277295
env:
278296
LEGACY: true
@@ -314,6 +332,8 @@ jobs:
314332
steps:
315333
- uses: actions/checkout@v4
316334
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
335+
- name: Xcode
336+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
317337
- name: Setup testing repo and quickstart
318338
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh database prerelease_testing
319339
- name: Install Secret GoogleService-Info.plist
@@ -346,6 +366,8 @@ jobs:
346366
steps:
347367
- uses: actions/checkout@v4
348368
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
369+
- name: Xcode
370+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
349371
- name: Setup testing repo and quickstart
350372
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh firestore prerelease_testing
351373
- name: Install Secret GoogleService-Info.plist
@@ -380,6 +402,8 @@ jobs:
380402
# steps:
381403
# - uses: actions/checkout@v4
382404
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
405+
# - name: Xcode
406+
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
383407
# - name: Setup testing repo and quickstart
384408
# run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh functions prerelease_testing
385409
# - name: install secret googleservice-info.plist
@@ -416,6 +440,8 @@ jobs:
416440
steps:
417441
- uses: actions/checkout@v4
418442
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
443+
- name: Xcode
444+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
419445
- name: Setup testing repo and quickstart
420446
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh inappmessaging prerelease_testing
421447
- name: install secret googleservice-info.plist
@@ -450,6 +476,8 @@ jobs:
450476
steps:
451477
- uses: actions/checkout@v4
452478
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
479+
- name: Xcode
480+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
453481
- name: Setup testing repo and quickstart
454482
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh messaging prerelease_testing
455483
- name: Install Secret GoogleService-Info.plist
@@ -482,6 +510,8 @@ jobs:
482510
steps:
483511
- uses: actions/checkout@v4
484512
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
513+
- name: Xcode
514+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
485515
- name: Setup testing repo and quickstart
486516
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh config prerelease_testing
487517
- name: Install Secret GoogleService-Info.plist
@@ -513,6 +543,8 @@ jobs:
513543
steps:
514544
- uses: actions/checkout@v4
515545
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
546+
- name: Xcode
547+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
516548
- name: Setup testing repo and quickstart
517549
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh storage prerelease_testing
518550
- name: Install Secret GoogleService-Info.plist
@@ -543,6 +575,8 @@ jobs:
543575
steps:
544576
- uses: actions/checkout@v4
545577
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
578+
- name: Xcode
579+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
546580
- name: Setup testing repo and quickstart
547581
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh Performance prerelease_testing
548582
- name: Install Secret GoogleService-Info.plist

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ jobs:
127127
with:
128128
name: firebase-ios-sdk
129129
path: ${{ env.local_sdk_repo_dir }}
130+
# Addresses flaky pushes due to missing git config on runner.
131+
- name: Set git config
132+
run: |
133+
git config --global user.email "google-oss-bot@example.com"
134+
git config --global user.name "google-oss-bot"
130135
- name: Update SpecsReleasing repo
131136
run: |
132137
[[ ${{ matrix.allowwarnings }} == true ]] && ALLOWWARNINGS=true
@@ -153,7 +158,7 @@ jobs:
153158
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
154159
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
155160
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
156-
runs-on: macos-14
161+
runs-on: macos-15
157162
steps:
158163
- uses: actions/checkout@v4
159164
- name: Set Xcode version
@@ -221,7 +226,7 @@ jobs:
221226
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
222227
testing_repo_dir: "/tmp/test/"
223228
testing_repo: "firebase-ios-sdk"
224-
runs-on: macos-14
229+
runs-on: macos-15
225230
steps:
226231
- uses: actions/checkout@v4
227232
- name: Set Xcode version
@@ -264,7 +269,7 @@ jobs:
264269
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
265270
testing_repo_dir: "/tmp/test/"
266271
testing_repo: "firebase-ios-sdk"
267-
runs-on: macos-14
272+
runs-on: macos-15
268273
steps:
269274
- uses: actions/checkout@v4
270275
- name: Set Xcode version
@@ -298,7 +303,7 @@ jobs:
298303
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
299304
testing_repo_dir: "/tmp/test/"
300305
testing_repo: "firebase-ios-sdk"
301-
runs-on: macos-14
306+
runs-on: macos-15
302307
steps:
303308
- uses: actions/checkout@v4
304309
- name: Set Xcode version
@@ -369,7 +374,7 @@ jobs:
369374
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
370375
testing_repo_dir: "/tmp/test/"
371376
testing_repo: "firebase-ios-sdk"
372-
runs-on: macos-14
377+
runs-on: macos-15
373378
steps:
374379
- uses: actions/checkout@v4
375380
- name: Set Xcode version
@@ -405,7 +410,7 @@ jobs:
405410
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
406411
testing_repo_dir: "/tmp/test/"
407412
testing_repo: "firebase-ios-sdk"
408-
runs-on: macos-14
413+
runs-on: macos-15
409414
steps:
410415
- uses: actions/checkout@v4
411416
- name: Set Xcode version
@@ -439,7 +444,7 @@ jobs:
439444
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
440445
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
441446
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
442-
runs-on: macos-14
447+
runs-on: macos-15
443448
steps:
444449
- uses: actions/checkout@v4
445450
- name: Set Xcode version
@@ -472,7 +477,7 @@ jobs:
472477
testing_repo_dir: "/tmp/test/"
473478
testing_repo: "firebase-ios-sdk"
474479
LEGACY: true
475-
runs-on: macos-14
480+
runs-on: macos-15
476481
steps:
477482
- uses: actions/checkout@v4
478483
- name: Set Xcode version
@@ -504,7 +509,7 @@ jobs:
504509
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
505510
testing_repo_dir: "/tmp/test/"
506511
testing_repo: "firebase-ios-sdk"
507-
runs-on: macos-14
512+
runs-on: macos-15
508513
steps:
509514
- uses: actions/checkout@v4
510515
- name: Set Xcode version

0 commit comments

Comments
 (0)