Skip to content

Commit 4e10e12

Browse files
daymxndaymxn
authored
Merge branch 'main' into daymxn-fal-limitedusetokens-support
2 parents 17113f3 + e176f01 commit 4e10e12

File tree

187 files changed

+2093
-731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+2093
-731
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- '.github/workflows/common_catalyst.yml'
1616
- 'Gemfile*'
1717
schedule:
18-
# Run every day at 1am(PST) - cron uses UTC times
18+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
1919
- cron: '0 9 * * *'
2020

2121
concurrency:
@@ -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/analytics.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '.github/workflows/analytics.yml'
1010
- 'Gemfile*'
1111
schedule:
12-
# Run every day at 1am (PST) - cron uses UTC times
12+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
1313
- cron: '0 9 * * *'
1414

1515
concurrency:

‎.github/workflows/appdistribution.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- '.github/workflows/common_catalyst.yml'
1515
- 'Gemfile*'
1616
schedule:
17-
# Run every day at 1am (PST) - cron uses UTC times
17+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
1818
- cron: '0 9 * * *'
1919

2020
concurrency:
@@ -54,6 +54,8 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v4
5656
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
57+
- name: Setup Xcode
58+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
5759
- name: Setup Bundler
5860
run: scripts/setup_bundler.sh
5961
- name: PodLibLint App Distribution Cron

‎.github/workflows/archiving.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
paths:
77
- '.github/workflows/archiving.yml'
88
schedule:
9-
# Run every day at 2am (PST) - cron uses UTC times
9+
# Run every day at 3am (PDT) / 6am (EDT) - cron uses UTC times
1010
# This is set to 3 hours after zip workflow finishes so zip testing can run after.
1111
- cron: '0 10 * * *'
1212

@@ -27,6 +27,8 @@ jobs:
2727
pod: ["FirebaseAppDistribution", "FirebaseInAppMessaging", "FirebasePerformance"]
2828
steps:
2929
- uses: actions/checkout@v4
30+
- name: Set Xcode version
31+
run: sudo xcode-select -s /Applications/Xcode_16.4.app
3032
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
3133
with:
3234
cache_key: cron-${{ matrix.os }}
@@ -50,6 +52,8 @@ jobs:
5052
pod: ["FirebaseABTesting", "FirebaseAuth", "FirebaseCore", "FirebaseCrashlytics", "FirebaseDatabase", "FirebaseFirestore", "FirebaseFunctions", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseStorage"]
5153
steps:
5254
- uses: actions/checkout@v4
55+
- name: Set Xcode version
56+
run: sudo xcode-select -s /Applications/Xcode_16.4.app
5357
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
5458
with:
5559
cache_key: pods-${{ matrix.os }}

‎.github/workflows/auth.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
- 'scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg'
1717
- 'Gemfile*'
1818
schedule:
19-
# Run every day at 1am (PST) - cron uses UTC times
19+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
2020
- cron: '0 9 * * *'
2121

2222
env:
@@ -156,6 +156,8 @@ jobs:
156156
steps:
157157
- uses: actions/checkout@v4
158158
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
159+
- name: Setup Xcode
160+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
159161
- name: Setup Bundler
160162
run: scripts/setup_bundler.sh
161163
- name: Configure test keychain

‎.github/workflows/client_app.yml‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- "IntegrationTesting/ClientApp/**"
1414
- "Gemfile*"
1515
schedule:
16-
# Run every day at 12am (PST) - cron uses UTC times
16+
# Run every day at 1am (PDT) / 4am (EDT) - cron uses UTC times
1717
- cron: "0 8 * * *"
1818

1919
env:
@@ -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/cocoapods-integration.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- '.github/workflows/cocoapods-integration.yml'
99
- 'Gemfile*'
1010
schedule:
11-
# Run every day at 2am (PST) - cron uses UTC times
11+
# Run every day at 3am (PDT) / 6am (EDT) - cron uses UTC times
1212
- cron: '0 10 * * *'
1313

1414
concurrency:
@@ -26,6 +26,8 @@ jobs:
2626
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
2727
with:
2828
cache_key: ${{ matrix.os }}
29+
- name: Xcode
30+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
2931
- name: Get realpath
3032
run: brew install coreutils
3133
- name: Build and test

‎.github/workflows/combine.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ on:
4242
# - 'Firestore/**' # (Disabled to avoid building Firestore in presubmits)
4343

4444
schedule:
45-
# Run every day at 11pm (PST) - cron uses UTC times
45+
# Run every day at 12am (PDT) / 3am (EDT) - cron uses UTC times
4646
- cron: '0 7 * * *'
4747

4848
concurrency:
@@ -67,6 +67,9 @@ jobs:
6767

6868
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
6969

70+
- name: Xcode
71+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
72+
7073
- name: Install xcpretty
7174
run: gem install xcpretty
7275

@@ -88,6 +91,8 @@ jobs:
8891
with:
8992
cache_key: ${{ matrix.os }}
9093
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
94+
- name: Xcode
95+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
9196
- name: Setup Bundler
9297
run: scripts/setup_bundler.sh
9398
- name: Install xcpretty

‎.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

0 commit comments

Comments
 (0)