Skip to content

Commit ebad68e

Browse files
andrewheardandrewheard
committed
Merge branch 'main' into ah/ai-partsrep-sendable
2 parents ffdf538 + 69ad8a4 commit ebad68e

23 files changed

+87
-87
lines changed

‎.github/workflows/abtesting.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v4
5252
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
5353
- name: Xcode
54-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
54+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
5555
- name: Setup quickstart
5656
env:
5757
LEGACY: true
@@ -86,7 +86,7 @@ jobs:
8686
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
8787
quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret"
8888
- name: Xcode
89-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
89+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
9090
- name: Build swift quickstart
9191
env:
9292
LEGACY: true
@@ -116,7 +116,7 @@ jobs:
116116
- name: Setup Bundler
117117
run: scripts/setup_bundler.sh
118118
- name: Xcode
119-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
119+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
120120
- name: PodLibLint ABTesting Cron
121121
run: |
122122
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb \

‎.github/workflows/client_app.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,25 @@ jobs:
2727
client-app-spm:
2828
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
2929
strategy:
30-
# TODO: Add Xcode matrix when Xcode 16 is ubiquitous on CI runners.
3130
matrix:
3231
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
3332
platform: [iOS]
3433
scheme: [ClientApp]
3534
os: [macos-14, macos-15]
35+
include:
36+
- os: macos-14
37+
xcode: Xcode_16.2
38+
- os: macos-15
39+
xcode: Xcode_16.4
3640
runs-on: ${{ matrix.os }}
3741
steps:
3842
- uses: actions/checkout@v4
3943
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
4044
with:
4145
cache_key: ${{ matrix.os }}
4246
- name: Xcode
43-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
44-
- name: Build Client App –– ${{ matrix.platform }}
47+
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
48+
- name: Build Client App - ${{ matrix.platform }}
4549
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
4650

4751
client-app-spm-source-firestore:
@@ -50,31 +54,39 @@ jobs:
5054
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
5155
FIREBASE_SOURCE_FIRESTORE: 1
5256
strategy:
53-
# TODO: Add Xcode matrix when Xcode 16 is ubiquitous on CI runners.
5457
matrix:
5558
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
5659
platform: [iOS]
5760
scheme: [ClientApp]
5861
os: [macos-14, macos-15]
62+
include:
63+
- os: macos-14
64+
xcode: Xcode_16.2
65+
- os: macos-15
66+
xcode: Xcode_16.4
5967
runs-on: ${{ matrix.os }}
6068
steps:
6169
- uses: actions/checkout@v4
6270
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
6371
with:
6472
cache_key: ${{ matrix.os }}
6573
- name: Xcode
66-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
67-
- name: Build Client App –– ${{ matrix.platform }}
74+
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
75+
- name: Build Client App - ${{ matrix.platform }}
6876
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
6977

7078
client-app-cocoapods:
7179
# Don't run on private repo unless it is a PR.
7280
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
7381
strategy:
74-
# TODO: Add Xcode matrix when Xcode 16 is ubiquitous on CI runners.
7582
matrix:
7683
scheme: [ClientApp-CocoaPods]
7784
os: [macos-14, macos-15]
85+
include:
86+
- os: macos-14
87+
xcode: Xcode_16.2
88+
- os: macos-15
89+
xcode: Xcode_16.4
7890
runs-on: ${{ matrix.os }}
7991
steps:
8092
- uses: actions/checkout@v4
@@ -85,7 +97,7 @@ jobs:
8597
- name: Setup Bundler
8698
run: scripts/setup_bundler.sh
8799
- name: Xcode
88-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
100+
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
89101
- name: Prereqs
90102
run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
91103
- name: Build

‎.github/workflows/common.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
- uses: actions/checkout@v4
6969
- name: Xcode
70-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
70+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
7171
- name: Generate Swift Package.resolved
7272
id: swift_package_resolve
7373
run: swift package resolve
@@ -104,10 +104,6 @@ jobs:
104104
key: ${{needs.spm-package-resolved.outputs.cache_key}}
105105
- name: Xcode
106106
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
107-
- name: Install visionOS, if needed.
108-
if: matrix.platform == 'visionOS'
109-
run: ls $(xcode-select -p)/Platforms/XROS.platform || \
110-
{ xcodebuild -downloadPlatform visionOS }
111107
- name: Run setup command, if needed.
112108
if: inputs.setup_command != ''
113109
run: ${{ inputs.setup_command }}

‎.github/workflows/common_catalyst.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup Bundler
3939
run: scripts/setup_bundler.sh
4040
- name: Xcode
41-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
41+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
4242
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
4343
with:
4444
timeout_minutes: 120

‎.github/workflows/core_extension.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@v4
4040
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
4141
- name: Xcode
42-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
42+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
4343
- name: Setup Bundler
4444
run: scripts/setup_bundler.sh
4545
- name: PodLibLint CoreInternal Cron

‎.github/workflows/core_internal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/checkout@v4
5555
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
5656
- name: Xcode
57-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
57+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
5858
- name: Setup Bundler
5959
run: scripts/setup_bundler.sh
6060
- name: PodLibLint CoreInternal Cron

‎.github/workflows/crashlytics.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v4
5454
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
5555
- name: Xcode
56-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
56+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
5757
- name: Setup quickstart
5858
run: scripts/setup_quickstart.sh crashlytics
5959
env:
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
python-version: '3.11'
8888
- name: Xcode
89-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
89+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
9090
- name: Setup quickstart
9191
run: scripts/setup_quickstart.sh crashlytics
9292
env:
@@ -130,7 +130,7 @@ jobs:
130130
- name: Setup Bundler
131131
run: scripts/setup_bundler.sh
132132
- name: Xcode
133-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
133+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
134134
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
135135
with:
136136
timeout_minutes: 120

‎.github/workflows/database.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-database.plist.gpg \
8585
quickstart-ios/database/GoogleService-Info.plist "$plist_secret"
8686
- name: Xcode
87-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
87+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
8888
- name: Test objc quickstart
8989
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Database false)
9090
- name: Test swift quickstart
@@ -106,7 +106,7 @@ jobs:
106106
- uses: actions/checkout@v4
107107
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
108108
- name: Xcode
109-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
109+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
110110
- name: Setup Bundler
111111
run: scripts/setup_bundler.sh
112112
- name: PodLibLint database Cron

‎.github/workflows/firebase_app_check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
cache_key: ${{ matrix.diagnostics }}
6060
- name: Xcode
61-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
61+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
6262
- name: Initialize xcodebuild
6363
run: scripts/setup_spm_tests.sh
6464
- name: iOS Unit Tests
@@ -84,7 +84,7 @@ jobs:
8484
- uses: actions/checkout@v4
8585
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
8686
- name: Xcode
87-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
87+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
8888
- name: Setup Bundler
8989
run: scripts/setup_bundler.sh
9090
- name: PodLibLint FirebaseAppCheck Cron

‎.github/workflows/firebasepod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup Bundler
3535
run: scripts/setup_bundler.sh
3636
- name: Xcode
37-
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
37+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
3838
- name: Prereqs
3939
run: scripts/install_prereqs.sh FirebasePod iOS
4040
- name: Build

0 commit comments

Comments
 (0)