Skip to content

Commit c2e289a

Browse files
visumickeyvisumickey
authored
Merge branch 'master' into perfDataCollectionStateForSessions
2 parents 564bcde + da631d2 commit c2e289a

File tree

90 files changed

+1584
-133
lines changed

Some content is hidden

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

90 files changed

+1584
-133
lines changed

‎.github/workflows/api-information.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
if: github.event.pull_request.head.repo.full_name == github.repository
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v3.5.3
1111
with:
1212
fetch-depth: 2
1313
submodules: true

‎.github/workflows/build-release-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v3.5.3
1717

1818
- name: Set up JDK 11
1919
uses: actions/setup-java@v3

‎.github/workflows/build-src-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build-src-check:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v3.0.2
16+
- uses: actions/checkout@v3.5.3
1717
- name: Set up JDK 11
1818
uses: actions/setup-java@v3
1919
with:

‎.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
BUNDLE_GEMFILE: ./ci/danger/Gemfile
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v3.5.3
1717
with:
1818
fetch-depth: 100
1919
submodules: true

‎.github/workflows/check-head-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check-head-dependencies:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v3.5.3
1414

1515
- name: Perform gradle build
1616
run: |

‎.github/workflows/ci_tests.yml

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
outputs:
1717
modules: ${{ steps.changed-modules.outputs.modules }}
1818
steps:
19-
- uses: actions/checkout@v3.0.2
19+
- uses: actions/checkout@v3.5.3
2020
with:
2121
fetch-depth: 2
2222
submodules: true
@@ -44,7 +44,7 @@ jobs:
4444
module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
4545

4646
steps:
47-
- uses: actions/checkout@v3.0.2
47+
- uses: actions/checkout@v3.5.3
4848
with:
4949
fetch-depth: 2
5050
submodules: true
@@ -100,7 +100,7 @@ jobs:
100100
module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
101101

102102
steps:
103-
- uses: actions/checkout@v3.0.2
103+
- uses: actions/checkout@v3.5.3
104104
with:
105105
fetch-depth: 2
106106
submodules: true
@@ -130,6 +130,47 @@ jobs:
130130
run: |
131131
./gradlew ${{matrix.module}}:deviceCheck withErrorProne -PtargetBackend="prod"
132132
133+
firestore_custom_integ_tests:
134+
name: "Firestore Custom Instrumentation Tests Against Named DB"
135+
runs-on: ubuntu-22.04
136+
needs:
137+
- determine_changed
138+
# only run on post submit or PRs not originating from forks.
139+
if: ((github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && contains(fromJSON(needs.determine_changed.outputs.modules), ':firebase-firestore')
140+
strategy:
141+
fail-fast: false
142+
143+
steps:
144+
- uses: actions/[email protected]
145+
with:
146+
fetch-depth: 2
147+
submodules: true
148+
149+
- name: Set up JDK 11
150+
uses: actions/setup-java@v3
151+
with:
152+
java-version: 11
153+
distribution: temurin
154+
cache: gradle
155+
156+
- name: Add google-services.json
157+
env:
158+
INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
159+
run: |
160+
echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
161+
- uses: google-github-actions/auth@v0
162+
with:
163+
credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
164+
- uses: google-github-actions/setup-gcloud@v0
165+
- name: Firestore Named DB Integ Tests
166+
env:
167+
FIREBASE_CI: 1
168+
FTL_RESULTS_BUCKET: android-ci
169+
FTL_RESULTS_DIR: ${{ github.event_name == 'pull_request' && format('pr-logs/pull/{0}/{1}/{2}/{3}_{4}/artifacts/', github.repository, github.event.pull_request.number, github.job, github.run_id, github.run_attempt) || format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt)}}
170+
FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
171+
run: |
172+
./gradlew firebase-firestore:deviceCheck withErrorProne -PtargetBackend="prod" -PtargetDatabaseId="test-db"
173+
133174
publish-test-results:
134175
name: "Publish Tests Results"
135176
needs:

‎.github/workflows/create_releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
create-pull-request:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v3.5.3
3030
with:
3131
fetch-depth: 0
3232

‎.github/workflows/diff-javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
run: mkdir ~/diff
1414

1515
- name: Checkout PR branch
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v3.5.3
1717
with:
1818
fetch-depth: 2
1919
submodules: true
@@ -32,7 +32,7 @@ jobs:
3232
run: mv build ~/diff/modified
3333

3434
- name: Checkout master
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v3.5.3
3636
with:
3737
ref: ${{ github.base_ref }}
3838

‎.github/workflows/fireci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "fireci tests"
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v3.0.2
18+
- uses: actions/checkout@v3.5.3
1919
- uses: actions/setup-python@v2
2020
with:
2121
python-version: '3.8'

‎.github/workflows/fireperf-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
environment: [ prod, autopush ]
2121
steps:
2222
- name: Checkout firebase-android-sdk
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v3.5.3
2424
- name: Checkout firebase-android-buildtools
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v3.5.3
2626
with:
2727
repository: FirebasePrivate/firebase-android-buildtools
2828
token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}

0 commit comments

Comments
 (0)