Skip to content

Commit 26d3be3

Browse files
andrewheardandrewheard
committed
Merge branch 'main' into ah/firebaseai-urlcontext
2 parents 0021c71 + a18f810 commit 26d3be3

File tree

137 files changed

+2468
-1889
lines changed

Some content is hidden

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

137 files changed

+2468
-1889
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ on:
1313
- '.github/workflows/common.yml'
1414
- '.github/workflows/common_cocoapods.yml'
1515
- '.github/workflows/common_catalyst.yml'
16+
- '.github/workflows/common_quickstart.yml'
17+
- '.github/workflows/common_cocoapods_cron.yml'
1618
- 'Gemfile*'
1719
schedule:
18-
# Run every day at 1am(PST) - cron uses UTC times
20+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
1921
- cron: '0 9 * * *'
2022

2123
concurrency:
@@ -40,37 +42,22 @@ jobs:
4042
product: FirebaseABTesting
4143

4244
quickstart:
43-
# Don't run on private repo unless it is a PR.
44-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
45-
46-
env:
45+
uses: ./.github/workflows/common_quickstart.yml
46+
with:
47+
product: ABTesting
48+
is_legacy: true
49+
setup_command: scripts/setup_quickstart.sh abtesting
50+
plist_src_path: scripts/gha-encrypted/qs-database.plist.gpg
51+
plist_dst_path: quickstart-ios/database/GoogleService-Info.plist
52+
secrets:
4753
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
48-
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
49-
runs-on: macos-15
50-
steps:
51-
- uses: actions/checkout@v4
52-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
53-
- name: Xcode
54-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
55-
- name: Setup quickstart
56-
env:
57-
LEGACY: true
58-
run: scripts/setup_quickstart.sh abtesting
59-
- name: Install Secret GoogleService-Info.plist
60-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
61-
quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret"
62-
- name: Test swift quickstart
63-
env:
64-
LEGACY: true
65-
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh ABTesting true)
6654

6755
quickstart-ftl-cron-only:
6856
# Don't run on private repo.
6957
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
7058

7159
env:
7260
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
73-
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
7461
runs-on: macos-15
7562
steps:
7663
- uses: actions/checkout@v4
@@ -99,25 +86,9 @@ jobs:
9986
test_type: "xctest"
10087

10188
abtesting-cron-only:
102-
# Don't run on private repo.
103-
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
104-
105-
runs-on: macos-15
106-
strategy:
107-
matrix:
108-
target: [ios, tvos, macos]
109-
flags: [
110-
'--use-static-frameworks'
111-
]
11289
needs: pod_lib_lint
113-
steps:
114-
- uses: actions/checkout@v4
115-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
116-
- name: Setup Bundler
117-
run: scripts/setup_bundler.sh
118-
- name: Xcode
119-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
120-
- name: PodLibLint ABTesting Cron
121-
run: |
122-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb \
123-
FirebaseABTesting.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
90+
uses: ./.github/workflows/common_cocoapods_cron.yml
91+
with:
92+
product: FirebaseABTesting
93+
platforms: '[ "ios", "tvos", "macos" ]'
94+
flags: '[ "--use-static-frameworks" ]'

‎.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: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ on:
1212
- '.github/workflows/common.yml'
1313
- '.github/workflows/common_cocoapods.yml'
1414
- '.github/workflows/common_catalyst.yml'
15+
- '.github/workflows/common_cocoapods_cron.yml'
1516
- 'Gemfile*'
1617
schedule:
17-
# Run every day at 1am (PST) - cron uses UTC times
18+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
1819
- cron: '0 9 * * *'
1920

2021
concurrency:
@@ -41,24 +42,9 @@ jobs:
4142
platforms: iOS # App Distro only supports iOS.
4243

4344
appdistribution-cron-only:
44-
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
45-
46-
runs-on: macos-15
47-
strategy:
48-
matrix:
49-
target: [ios]
50-
flags: [
51-
'--use-static-frameworks'
52-
]
5345
needs: pod_lib_lint
54-
steps:
55-
- uses: actions/checkout@v4
56-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
57-
- name: Setup Xcode
58-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
59-
- name: Setup Bundler
60-
run: scripts/setup_bundler.sh
61-
- name: PodLibLint App Distribution Cron
62-
run: |
63-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
64-
--platforms=${{ matrix.target }} ${{ matrix.flags }}
46+
uses: ./.github/workflows/common_cocoapods_cron.yml
47+
with:
48+
product: FirebaseAppDistribution
49+
platforms: '[ "ios" ]'
50+
flags: '[ "--use-static-frameworks" ]'

‎.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: 23 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ on:
1313
- '.github/workflows/common.yml'
1414
- '.github/workflows/common_cocoapods.yml'
1515
- '.github/workflows/common_catalyst.yml'
16+
- '.github/workflows/common_quickstart.yml'
17+
- '.github/workflows/common_cocoapods_cron.yml'
1618
- 'scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg'
1719
- 'Gemfile*'
1820
schedule:
19-
# Run every day at 1am (PST) - cron uses UTC times
21+
# Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
2022
- cron: '0 9 * * *'
2123

2224
env:
@@ -86,30 +88,22 @@ jobs:
8688
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
8789
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
8890
with:
89-
timeout_minutes: 120
91+
timeout_minutes: 15
9092
max_attempts: 3
91-
retry_on: error
9293
retry_wait_seconds: 120
9394
command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
9495

9596
quickstart:
96-
# Don't run on private repo unless it is a PR.
97-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
98-
99-
env:
97+
uses: ./.github/workflows/common_quickstart.yml
98+
with:
99+
product: Authentication
100+
is_legacy: false
101+
setup_command: scripts/setup_quickstart.sh authentication
102+
plist_src_path: scripts/gha-encrypted/qs-authentication.plist.gpg
103+
plist_dst_path: quickstart-ios/authentication/GoogleService-Info.plist
104+
run_tests: false
105+
secrets:
100106
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
101-
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
102-
runs-on: macos-15
103-
steps:
104-
- uses: actions/checkout@v4
105-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
106-
- name: Setup quickstart
107-
run: scripts/setup_quickstart.sh authentication
108-
- name: Install Secret GoogleService-Info.plist
109-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-auth.plist.gpg \
110-
quickstart-ios/authentication/GoogleService-Info.plist "$plist_secret"
111-
- name: Test swift quickstart
112-
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Authentication false)
113107

114108
# TODO(@sunmou99): currently have issue with this job, will re-enable it once the issue resolved.
115109
# quickstart-ftl-cron-only:
@@ -129,7 +123,7 @@ jobs:
129123
# - name: Setup quickstart
130124
# run: scripts/setup_quickstart.sh authentication
131125
# - name: Install Secret GoogleService-Info.plist
132-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-auth.plist.gpg \
126+
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-authentication.plist.gpg \
133127
# quickstart-ios/authentication/GoogleService-Info.plist "$plist_secret"
134128
# - name: Build swift quickstart
135129
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Authentication)
@@ -141,31 +135,12 @@ jobs:
141135
# test_type: "xctest"
142136

143137
auth-cron-only:
144-
# Don't run on private repo.
145-
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
146-
147-
runs-on: macos-15
148-
strategy:
149-
matrix:
150-
# The macos and tvos tests can hang, and watchOS doesn't have tests.
151-
target: [ios, tvos --skip-tests, macos --skip-tests, watchos --skip-tests]
152-
flags: [
153-
'--use-static-frameworks'
154-
]
155-
needs: pod_lib_lint
156-
steps:
157-
- uses: actions/checkout@v4
158-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
159-
- name: Setup Xcode
160-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
161-
- name: Setup Bundler
162-
run: scripts/setup_bundler.sh
163-
- name: Configure test keychain
164-
run: scripts/configure_test_keychain.sh
165-
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
166-
with:
167-
timeout_minutes: 120
168-
max_attempts: 3
169-
retry_on: error
170-
retry_wait_seconds: 120
171-
command: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
138+
needs: pod_lib_lint
139+
uses: ./.github/workflows/common_cocoapods_cron.yml
140+
with:
141+
product: FirebaseAuth
142+
platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
143+
flags: '[ "--use-static-frameworks" ]'
144+
setup_command: scripts/configure_test_keychain.sh
145+
secrets:
146+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

‎.github/workflows/client_app.yml‎

Lines changed: 1 addition & 1 deletion
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:

‎.github/workflows/cocoapods-integration.yml‎

Lines changed: 1 addition & 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:

‎.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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ jobs:
112112
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
113113
if: contains(join(inputs.platforms), matrix.platform) || matrix.os == 'macos-14'
114114
with:
115-
timeout_minutes: 120
115+
timeout_minutes: 15
116116
max_attempts: 3
117-
retry_on: error
118117
retry_wait_seconds: 120
119118
command: |
120119
./scripts/build.sh \

‎.github/workflows/common_catalyst.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ jobs:
4141
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
4242
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
4343
with:
44-
timeout_minutes: 120
44+
timeout_minutes: 15
4545
max_attempts: 3
46-
retry_on: error
4746
retry_wait_seconds: 120
4847
command: |
4948
scripts/test_catalyst.sh \

0 commit comments

Comments
 (0)