Skip to content

Commit 9af06c3

Browse files
author
renkelvin
authored
Merge branch 'master' into recaptcha
2 parents 9424622 + 013d869 commit 9af06c3

File tree

486 files changed

+16725
-2559
lines changed

Some content is hidden

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

486 files changed

+16725
-2559
lines changed

‎.github/workflows/api_diff_report.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: API Diff Report
2+
3+
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
7+
cancel-in-progress: true
8+
9+
env:
10+
STAGE_PROGRESS: progress
11+
STAGE_END: end
12+
PR_API_OUTPUT: ci_outputs/pr_branch_api
13+
BASE_API_OUTPUT: ci_outputs/base_branch_api
14+
DIFF_REPORT_OUTPUT: ci_outputs/diff_report
15+
16+
jobs:
17+
diff_report:
18+
runs-on: macos-latest
19+
env:
20+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
21+
22+
steps:
23+
- name: Checkout PR branch
24+
uses: actions/checkout@v3
25+
with:
26+
fetch-depth: 2
27+
28+
- name: Copy diff report tools
29+
run: cp -a scripts/api_diff_report/. ~/api_diff_report
30+
31+
- id: get_changed_files
32+
name: Get changed file list
33+
run: |
34+
echo "file_list=$(git diff --name-only -r HEAD^1 HEAD | tr '\n' ' ')" >> $GITHUB_OUTPUT
35+
36+
- name: Setup python
37+
uses: actions/setup-python@v4
38+
with:
39+
python-version: 3.7
40+
41+
- name: Install Prerequisites
42+
run: ~/api_diff_report/prerequisite.sh
43+
44+
- name: Clean Diff Report Comment in PR
45+
run: |
46+
python ~/api_diff_report/pr_commenter.py \
47+
--stage ${{ env.STAGE_PROGRESS }} \
48+
--token ${{github.token}} \
49+
--pr_number ${{github.event.pull_request.number}} \
50+
--commit $GITHUB_SHA \
51+
--run_id ${{github.run_id}}
52+
53+
- name: Generate API files for PR branch
54+
run: |
55+
python ~/api_diff_report/api_info.py \
56+
--file_list ${{ steps.get_changed_files.outputs.file_list }} \
57+
--output_dir ${{ env.PR_API_OUTPUT }}
58+
59+
- name: Checkout Base branch
60+
run: git checkout HEAD^
61+
62+
- name: Generate API files for Base branch
63+
run: |
64+
python ~/api_diff_report/api_info.py \
65+
--file_list ${{ steps.get_changed_files.outputs.file_list }} \
66+
--output_dir ${{ env.BASE_API_OUTPUT }}
67+
68+
- name: Generate API Diff Report
69+
run: |
70+
python ~/api_diff_report/api_diff_report.py \
71+
--pr_branch ${{ env.PR_API_OUTPUT }} \
72+
--base_branch ${{ env.BASE_API_OUTPUT }} \
73+
--output_dir ${{ env.DIFF_REPORT_OUTPUT }}
74+
75+
- name: Update Diff Report Comment in PR
76+
run: |
77+
python ~/api_diff_report/pr_commenter.py \
78+
--stage ${{ env.STAGE_END }} \
79+
--report ${{ env.DIFF_REPORT_OUTPUT }} \
80+
--token ${{github.token}} \
81+
--pr_number ${{github.event.pull_request.number}} \
82+
--commit $GITHUB_SHA \
83+
--run_id ${{github.run_id}}
84+
85+
- uses: actions/upload-artifact@v3
86+
if: ${{ !cancelled() }}
87+
with:
88+
name: api_info_and_report
89+
path: ci_outputs
90+
retention-days: 1

‎.github/workflows/auth.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
2323

2424
runs-on: macos-12
25-
env:
26-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
27-
POD_LIB_LINT_ONLY: 1
2825
strategy:
2926
matrix:
3027
target: [ios, tvos, macos, watchos]
@@ -45,8 +42,6 @@ jobs:
4542

4643
env:
4744
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
48-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
49-
POD_LIB_LINT_ONLY: 1
5045
runs-on: macos-12
5146
steps:
5247
- uses: actions/checkout@v3
@@ -98,9 +93,6 @@ jobs:
9893
catalyst:
9994
# Don't run on private repo unless it is a PR.
10095
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
101-
env:
102-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
103-
POD_LIB_LINT_ONLY: 1
10496
runs-on: macos-12
10597
steps:
10698
- uses: actions/checkout@v3

‎.github/workflows/core.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
strategy:
2323
matrix:
2424
target: [ios, tvos, macos]
25-
env:
26-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
27-
POD_LIB_LINT_ONLY: 1
2825
steps:
2926
- uses: actions/checkout@v3
3027
- uses: ruby/setup-ruby@v1
@@ -55,9 +52,6 @@ jobs:
5552
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
5653

5754
runs-on: macos-12
58-
env:
59-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
60-
POD_LIB_LINT_ONLY: 1
6155
steps:
6256
- uses: actions/checkout@v3
6357
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

‎.github/workflows/core_extension.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ jobs:
2121
strategy:
2222
matrix:
2323
target: [ios, tvos, macos]
24-
env:
25-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
26-
POD_LIB_LINT_ONLY: 1
2724
steps:
2825
- uses: actions/checkout@v3
2926
- uses: ruby/setup-ruby@v1

‎.github/workflows/core_internal.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ jobs:
1919
strategy:
2020
matrix:
2121
target: [ios, tvos, macos]
22-
env:
23-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
24-
POD_LIB_LINT_ONLY: 1
2522
steps:
2623
- uses: actions/checkout@v3
2724
- uses: ruby/setup-ruby@v1
@@ -48,9 +45,6 @@ jobs:
4845
# Don't run on private repo unless it is a PR.
4946
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
5047
runs-on: macos-12
51-
env:
52-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
53-
POD_LIB_LINT_ONLY: 1
5448
steps:
5549
- uses: actions/checkout@v3
5650
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

‎.github/workflows/app_check.yml‎ renamed to ‎.github/workflows/firebase_app_check.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: app_check
1+
name: firebase_app_check
22

33
on:
44
pull_request:
55
paths:
66
- 'FirebaseAppCheck**'
7-
- '.github/workflows/app_check.yml'
7+
- '.github/workflows/firebase_app_check.yml'
88
- 'Gemfile*'
99
schedule:
1010
# Run every day at 11pm (PST) - cron uses UTC times
@@ -22,9 +22,6 @@ jobs:
2222
strategy:
2323
matrix:
2424
target: [ios, tvos, macos]
25-
env:
26-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
27-
POD_LIB_LINT_ONLY: 1
2825
steps:
2926
- uses: actions/checkout@v3
3027
- uses: ruby/setup-ruby@v1
@@ -39,9 +36,6 @@ jobs:
3936
# Don't run on private repo unless it is a PR.
4037
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
4138
runs-on: macos-12
42-
env:
43-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
44-
POD_LIB_LINT_ONLY: 1
4539
steps:
4640
- uses: actions/checkout@v3
4741
- uses: ruby/setup-ruby@v1
@@ -65,7 +59,7 @@ jobs:
6559
- name: Initialize xcodebuild
6660
run: scripts/setup_spm_tests.sh
6761
- name: iOS Unit Tests
68-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnit iOS spm ${{ matrix.diagnostic }}
62+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseAppCheckUnit iOS spm ${{ matrix.diagnostic }}
6963
- name: Upload raw logs if failed
7064
if: ${{ failure() }}
7165
uses: actions/upload-artifact@v2
@@ -107,6 +101,6 @@ jobs:
107101
- name: Initialize xcodebuild
108102
run: scripts/setup_spm_tests.sh
109103
- name: Unit Tests
110-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnit ${{ matrix.target }} spm
104+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseAppCheckUnit ${{ matrix.target }} spm
111105
- name: Swift Unit Tests
112-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnitSwift ${{ matrix.target }} spm
106+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseAppCheckUnitSwift ${{ matrix.target }} spm

‎.github/workflows/installations.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
runs-on: macos-12
2323
env:
2424
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
25-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
26-
POD_LIB_LINT_ONLY: 1
2725
strategy:
2826
matrix:
2927
target: [ios, tvos, macos]
@@ -67,9 +65,6 @@ jobs:
6765
catalyst:
6866
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
6967
runs-on: macos-12
70-
env:
71-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
72-
POD_LIB_LINT_ONLY: 1
7368
steps:
7469
- uses: actions/checkout@v3
7570
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -128,8 +123,6 @@ jobs:
128123
env:
129124
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
130125
FIR_IID_INTEGRATION_TESTS_REQUIRED: ${{ secrets.GHASecretsGPGPassphrase1 }}
131-
# This env var is set because the job has a dependency on the unpublished HeatbeatLoggingTestUtils.
132-
POD_LIB_LINT_ONLY: 1
133126
strategy:
134127
matrix:
135128
target: [ios, tvos, macos]

‎.github/workflows/sessions.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333
run: scripts/setup_bundler.sh
3434
- name: Build and test
3535
run: |
36-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseSessions.podspec --platforms=${{ matrix.target }}
36+
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseSessions.podspec \
37+
--platforms=${{ matrix.target }} \
3738
3839
spm:
3940
# Don't run on private repo unless it is a PR.

‎.github/workflows/storage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
spm-cron:
6464
# Don't run on private repo.
65-
# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
65+
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
6666
runs-on: macos-12
6767
strategy:
6868
matrix:

‎.github/workflows/zip.yml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
3535
with:
3636
cache_key: ${{ matrix.os }}
37-
- name: Xcode 13.3.1
38-
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app/Contents/Developer
37+
- name: Xcode 14.1
38+
run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
3939
- uses: ruby/setup-ruby@v1
4040
- name: Setup Bundler
4141
run: ./scripts/setup_bundler.sh
@@ -57,8 +57,8 @@ jobs:
5757
runs-on: macos-12
5858
steps:
5959
- uses: actions/checkout@v3
60-
- name: Xcode 13.3.1
61-
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app/Contents/Developer
60+
- name: Xcode 14.1
61+
run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
6262
- name: Build
6363
run: |
6464
cd ReleaseTooling
@@ -74,8 +74,8 @@ jobs:
7474
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
7575
with:
7676
cache_key: ${{ matrix.os }}
77-
- name: Xcode 13.3.1
78-
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app/Contents/Developer
77+
- name: Xcode 14.1
78+
run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
7979
- uses: ruby/setup-ruby@v1
8080
- name: Setup Bundler
8181
run: ./scripts/setup_bundler.sh
@@ -402,9 +402,6 @@ jobs:
402402
SDK: "Firestore"
403403
runs-on: macos-12
404404
steps:
405-
# Xcode 14 fails to build FirebaseAuthUI because it includes Resources. See #9886.
406-
- name: Xcode 13.3.1
407-
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app/Contents/Developer
408405
- uses: actions/checkout@v3
409406
- name: Get framework dir
410407
uses: actions/download-artifact@v1
@@ -447,8 +444,8 @@ jobs:
447444
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
448445
runs-on: macos-12
449446
steps:
450-
- name: Xcode 13.3.1
451-
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app/Contents/Developer
447+
- name: Xcode 14.1
448+
run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
452449
- uses: actions/checkout@v3
453450
- name: Get framework dir
454451
uses: actions/download-artifact@v1

0 commit comments

Comments
 (0)