Skip to content

Commit 81b0cc1

Browse files
paulb777paulb777
authored
Merge branch 'main' into pb-fst-auth-token-crash
2 parents 272cefe + 1feabe5 commit 81b0cc1

File tree

407 files changed

+59447
-6401
lines changed

Some content is hidden

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

407 files changed

+59447
-6401
lines changed

‎.github/actions/notices_generation/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
fi
4141
shell: bash
4242
- name: Upload artifacts
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
4444
with:
4545
name: notices
4646
path: ${{ inputs.notices-path }}

‎.github/workflows/abtesting.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -45,44 +45,12 @@ jobs:
4545
uses: ./.github/workflows/common_quickstart.yml
4646
with:
4747
product: ABTesting
48-
setup_command: scripts/setup_quickstart_spm.sh abtesting
48+
setup_command: scripts/setup_quickstart.sh abtesting
4949
plist_src_path: scripts/gha-encrypted/qs-abtesting.plist.gpg
5050
plist_dst_path: quickstart-ios/abtesting/GoogleService-Info.plist
5151
secrets:
5252
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
5353

54-
quickstart-ftl-cron-only:
55-
# Don't run on private repo.
56-
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
57-
58-
env:
59-
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
60-
runs-on: macos-15
61-
steps:
62-
- uses: actions/checkout@v4
63-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
64-
- name: Setup Bundler
65-
run: scripts/setup_bundler.sh
66-
- name: Install xcpretty
67-
run: gem install xcpretty
68-
- uses: actions/setup-python@v5
69-
with:
70-
python-version: '3.11'
71-
- name: Setup quickstart
72-
run: scripts/setup_quickstart_spm.sh abtesting
73-
- name: Install Secret GoogleService-Info.plist
74-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
75-
quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret"
76-
- name: Xcode
77-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
78-
- name: Build swift quickstart
79-
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh ABTesting)
80-
- id: ftl_test
81-
uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
82-
with:
83-
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
84-
testapp_dir: quickstart-ios/build-for-testing
85-
test_type: "xctest"
8654

8755
abtesting-cron-only:
8856
needs: pod_lib_lint

‎.github/workflows/analytics.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ${{ matrix.os }}
3434

3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3737
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
3838
- name: Setup Bundler
3939
run: scripts/setup_bundler.sh

‎.github/workflows/api_diff_report.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout PR branch
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2525
with:
2626
fetch-depth: 2
2727

@@ -34,7 +34,7 @@ jobs:
3434
echo "file_list=$(git diff --name-only -r HEAD^1 HEAD | tr '\n' ' ')" >> $GITHUB_OUTPUT
3535
3636
- name: Setup python
37-
uses: actions/setup-python@v5
37+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
3838
with:
3939
python-version: '3.11'
4040

@@ -82,7 +82,7 @@ jobs:
8282
--commit $GITHUB_SHA \
8383
--run_id ${{github.run_id}}
8484
85-
- uses: actions/upload-artifact@v4
85+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
8686
if: ${{ !cancelled() }}
8787
with:
8888
name: api_info_and_report

‎.github/workflows/archiving.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: archiving
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_dispatch:
58
pull_request:
@@ -18,47 +21,50 @@ jobs:
1821
# Archive tests for pods that support iOS only.
1922
pods-ios-only-cron:
2023
# Don't run on private repo.
21-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
22-
24+
if: github.repository == 'Firebase/firebase-ios-sdk'
2325
runs-on: macos-15
2426
strategy:
2527
matrix:
2628
# These need to be on a single line or else the formatting won't validate.
2729
pod: ["FirebaseAppDistribution", "FirebaseInAppMessaging", "FirebasePerformance"]
2830
steps:
29-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3032
- name: Set Xcode version
3133
run: sudo xcode-select -s /Applications/Xcode_16.4.app
32-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
33-
with:
34-
cache_key: cron-${{ matrix.os }}
3534
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
3635
- name: Setup Bundler
3736
run: scripts/setup_bundler.sh
3837
- name: Setup project and archive
39-
run: scripts/test_archiving.sh ${{ matrix.pod }} ios ArchiveOutputs/ios.xcarchive
38+
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
39+
with:
40+
timeout_minutes: 20
41+
max_attempts: 3
42+
retry_wait_seconds: 300
43+
command: scripts/test_archiving.sh ${{ matrix.pod }} ios ArchiveOutputs/ios.xcarchive
4044

4145

4246
# Archive tests for pods that support iOS, tvOS, and macOS.
4347
pods-ios-tvos-macos-cron:
4448
# Don't run on private repo.
45-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
46-
49+
if: github.repository == 'Firebase/firebase-ios-sdk'
4750
runs-on: macos-15
4851
strategy:
4952
matrix:
5053
target: [ios, tvos, macos]
5154
# These need to be on a single line or else the formatting won't validate.
5255
pod: ["FirebaseABTesting", "FirebaseAuth", "FirebaseCore", "FirebaseCrashlytics", "FirebaseDatabase", "FirebaseFirestore", "FirebaseFunctions", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseStorage"]
5356
steps:
54-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5558
- name: Set Xcode version
5659
run: sudo xcode-select -s /Applications/Xcode_16.4.app
57-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
58-
with:
59-
cache_key: pods-${{ matrix.os }}
6060
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
6161
- name: Setup Bundler
6262
run: scripts/setup_bundler.sh
6363
- name: Setup project and archive
64-
run: scripts/test_archiving.sh ${{ matrix.pod }} ${{ matrix.target }} ArchiveOutputs/${{ matrix.target }}.xcarchive
64+
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
65+
with:
66+
# Firestore gets a 60 min. timeout, everything else gets 20 min.
67+
timeout_minutes: ${{ matrix.pod == 'FirebaseFirestore' && 60 || 20 }}
68+
max_attempts: 3
69+
retry_wait_seconds: 300
70+
command: scripts/test_archiving.sh ${{ matrix.pod }} ${{ matrix.target }} ArchiveOutputs/${{ matrix.target }}.xcarchive

‎.github/workflows/auth.yml‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ jobs:
6363
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
6464
runs-on: macos-15
6565
steps:
66-
- uses: actions/checkout@v4
67-
- uses: actions/cache/restore@v4
66+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
67+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
6868
with:
6969
path: .build
7070
key: ${{ needs.spm.outputs.cache_key }}
@@ -97,46 +97,19 @@ jobs:
9797
uses: ./.github/workflows/common_quickstart.yml
9898
with:
9999
product: Authentication
100-
setup_command: scripts/setup_quickstart_spm.sh authentication
100+
setup_command: scripts/setup_quickstart.sh authentication
101101
plist_src_path: scripts/gha-encrypted/qs-authentication.plist.gpg
102102
plist_dst_path: quickstart-ios/authentication/GoogleService-Info.plist
103103
run_tests: false
104104
secrets:
105105
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
106106

107-
# TODO(@sunmou99): currently have issue with this job, will re-enable it once the issue resolved.
108-
# quickstart-ftl-cron-only:
109-
# # Don't run on private repo.
110-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
111-
112-
# env:
113-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
114-
# runs-on: macos-14
115-
# steps:
116-
# - uses: actions/checkout@v4
117-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
118-
# - uses: actions/setup-python@v5
119-
# with:
120-
# python-version: '3.11'
121-
# - name: Setup quickstart
122-
# run: scripts/setup_quickstart.sh authentication
123-
# - name: Install Secret GoogleService-Info.plist
124-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-authentication.plist.gpg \
125-
# quickstart-ios/authentication/GoogleService-Info.plist "$plist_secret"
126-
# - name: Build swift quickstart
127-
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Authentication)
128-
# - id: ftl_test
129-
# uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
130-
# with:
131-
# credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
132-
# testapp_dir: quickstart-ios/build-for-testing
133-
# test_type: "xctest"
134-
135107
auth-cron-only:
136108
needs: pod_lib_lint
137109
uses: ./.github/workflows/common_cocoapods_cron.yml
138110
with:
139111
product: FirebaseAuth
112+
ignore_deprecation_warnings: true
140113
platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
141114
flags: '[ "--use-static-frameworks" ]'
142115
setup_command: scripts/configure_test_keychain.sh

‎.github/workflows/check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
env:
2121
MINT_PATH: ${{ github.workspace }}/mint
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2424

25-
- uses: actions/setup-python@v5
25+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2626
with:
2727
python-version: 3.11
2828

2929
- name: Cache Mint packages
30-
uses: actions/cache@v4
30+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
3131
with:
3232
path: ${{ env.MINT_PATH }}
3333
key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}

‎.github/workflows/client_app.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ jobs:
3939
xcode: Xcode_16.4
4040
runs-on: ${{ matrix.os }}
4141
steps:
42-
- uses: actions/checkout@v4
43-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
44-
with:
45-
cache_key: ${{ matrix.os }}
42+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4643
- name: Xcode
4744
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
4845
- name: Build Client App - ${{ matrix.platform }}
@@ -66,10 +63,7 @@ jobs:
6663
xcode: Xcode_16.4
6764
runs-on: ${{ matrix.os }}
6865
steps:
69-
- uses: actions/checkout@v4
70-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
71-
with:
72-
cache_key: ${{ matrix.os }}
66+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7367
- name: Xcode
7468
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
7569
- name: Build Client App - ${{ matrix.platform }}
@@ -89,10 +83,7 @@ jobs:
8983
xcode: Xcode_16.4
9084
runs-on: ${{ matrix.os }}
9185
steps:
92-
- uses: actions/checkout@v4
93-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
94-
with:
95-
cache_key: ${{ matrix.os }}
86+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9687
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
9788
- name: Setup Bundler
9889
run: scripts/setup_bundler.sh

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,18 @@ jobs:
2222

2323
runs-on: macos-15
2424
steps:
25-
- uses: actions/checkout@v4
26-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
27-
with:
28-
cache_key: ${{ matrix.os }}
25+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2926
- name: Xcode
3027
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
3128
- name: Get realpath
3229
run: brew install coreutils
3330
- name: Build and test
34-
run: |
35-
scripts/third_party/travis/retry.sh ./IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh \
36-
--gemfile=./IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile \
37-
--podfile=./IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile
31+
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
32+
with:
33+
timeout_minutes: 20
34+
max_attempts: 3
35+
retry_wait_seconds: 300
36+
command: |
37+
./IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh \
38+
--gemfile=./IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile \
39+
--podfile=./IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile

‎.github/workflows/combine.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ jobs:
6060
target: [iOS]
6161

6262
steps:
63-
- uses: actions/checkout@v4
64-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
65-
with:
66-
cache_key: ${{ matrix.os }}
63+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6764

6865
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
6966

@@ -86,10 +83,7 @@ jobs:
8683
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
8784
runs-on: macos-15
8885
steps:
89-
- uses: actions/checkout@v4
90-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
91-
with:
92-
cache_key: ${{ matrix.os }}
86+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9387
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
9488
- name: Xcode
9589
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer

0 commit comments

Comments
 (0)