Skip to content

Commit d80dbd9

Browse files
authored
Revert "Merge master into realtime-rc-merge and use Firebase executors. (#4473)"
This reverts commit 2e94bb7.
1 parent 2e94bb7 commit d80dbd9

File tree

469 files changed

+12491
-21565
lines changed

Some content is hidden

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

469 files changed

+12491
-21565
lines changed

.github/workflows/api-information.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ jobs:
1717
java-version: 11
1818
distribution: temurin
1919
cache: gradle
20+
- name: Set up NDK 21.4.7075529
21+
run: |
22+
ANDROID_ROOT=/usr/local/lib/android
23+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
24+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
25+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
26+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
27+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
28+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
2029
- name: Set up Python 3.10
2130
uses: actions/setup-python@v4
2231
with:

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ jobs:
1414
runs-on: ubuntu-22.04
1515
steps:
1616
- uses: actions/[email protected]
17+
- name: Setup NDK
18+
run: |
19+
ANDROID_ROOT=/usr/local/lib/android
20+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
21+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
22+
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT
23+
1724
- name: Set up JDK 11
1825
uses: actions/setup-java@v2
1926
with:
@@ -26,7 +33,7 @@ jobs:
2633
run: |
2734
./gradlew -b buildSrc/build.gradle.kts -PenablePluginTests=true check
2835
- name: Publish Test Results
29-
uses: EnricoMi/publish-unit-test-result-action@94ba6dbddef5ec4aa827fc275cf7d563bc4d398f
36+
uses: EnricoMi/publish-unit-test-result-action@v1
3037
with:
3138
files: "**/build/test-results/**/*.xml"
3239
check_name: "buildSrc Test Results"

.github/workflows/ci_tests.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ concurrency:
44
cancel-in-progress: true
55
on:
66
pull_request:
7+
branches:
8+
- '*'
79
push:
810
branches:
911
- master
@@ -20,6 +22,15 @@ jobs:
2022
with:
2123
fetch-depth: 2
2224
submodules: true
25+
- name: Set up NDK 21.4.7075529
26+
run: |
27+
ANDROID_ROOT=/usr/local/lib/android
28+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
29+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
30+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
31+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
32+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
33+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
2334
2435
- name: Set up JDK 11
2536
uses: actions/setup-java@v2
@@ -48,6 +59,15 @@ jobs:
4859
with:
4960
fetch-depth: 2
5061
submodules: true
62+
- name: Set up NDK 21.4.7075529
63+
run: |
64+
ANDROID_ROOT=/usr/local/lib/android
65+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
66+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
67+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
68+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
69+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
70+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
5171
5272
- name: Set up JDK 11
5373
uses: actions/setup-java@v2
@@ -98,6 +118,15 @@ jobs:
98118
with:
99119
fetch-depth: 2
100120
submodules: true
121+
- name: Set up NDK 21.4.7075529
122+
run: |
123+
ANDROID_ROOT=/usr/local/lib/android
124+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
125+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
126+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
127+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
128+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
129+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
101130
102131
- name: Set up JDK 11
103132
uses: actions/setup-java@v2

.github/workflows/copyright-check.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
-e py \
2222
-e gradle \
2323
-e java \
24-
-e kt \
2524
-e groovy \
2625
-e sh \
2726
-e proto

.github/workflows/create_releases.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/diff-javadoc.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/workflows/fireci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ jobs:
1818
- uses: actions/[email protected]
1919
- uses: actions/setup-python@v2
2020
with:
21-
python-version: '3.8'
21+
python-version: '3.9'
2222
- run: |
2323
pip install -e "ci/fireci[test]"
2424
- run: |
2525
pytest ci/fireci
26-
- run: |
27-
mypy --config-file ci/fireci/setup.cfg ci/fireci/

.github/workflows/fireperf-e2e.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ jobs:
3333
java-version: 11
3434
distribution: temurin
3535
cache: gradle
36+
- name: Set up NDK 21.4.7075529
37+
run: |
38+
ANDROID_ROOT=/usr/local/lib/android
39+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
40+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
41+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
42+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
43+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
44+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
3645
- name: Set up Python 3.10
3746
uses: actions/setup-python@v4
3847
with:

.github/workflows/health-metrics.yml

Lines changed: 21 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
11
name: Health Metrics
22

3-
concurrency:
4-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
5-
cancel-in-progress: true
6-
7-
on:
8-
pull_request:
9-
push:
10-
branches:
11-
- master
12-
# add other feature branches here
13-
# TODO(yifany): support workflow_dispatch for metric tests (or only for startup time test)
3+
on: [ pull_request, push ]
144

155
env:
166
GITHUB_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
177

188
jobs:
199
coverage:
2010
name: Coverage
21-
if: |
22-
(github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
23-
|| (github.event_name == 'pull_request'
24-
&& github.event.pull_request.head.repo.full_name == github.repository)
11+
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)
2512
runs-on: ubuntu-latest
2613
steps:
2714
- uses: actions/checkout@v3
@@ -34,6 +21,15 @@ jobs:
3421
java-version: 11
3522
distribution: temurin
3623
cache: gradle
24+
- name: Set up NDK 21.4.7075529
25+
run: |
26+
ANDROID_ROOT=/usr/local/lib/android
27+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
28+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
29+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
30+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
31+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
32+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
3733
- name: Set up Python 3.10
3834
uses: actions/setup-python@v4
3935
with:
@@ -53,10 +49,7 @@ jobs:
5349

5450
size:
5551
name: Size
56-
if: |
57-
(github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
58-
|| (github.event_name == 'pull_request'
59-
&& github.event.pull_request.head.repo.full_name == github.repository)
52+
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)
6053
runs-on: ubuntu-latest
6154
steps:
6255
- uses: actions/checkout@v3
@@ -69,6 +62,15 @@ jobs:
6962
java-version: 11
7063
distribution: temurin
7164
cache: gradle
65+
- name: Set up NDK 21.4.7075529
66+
run: |
67+
ANDROID_ROOT=/usr/local/lib/android
68+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
69+
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
70+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
71+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
72+
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
73+
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
7274
- name: Set up Python 3.10
7375
uses: actions/setup-python@v4
7476
with:
@@ -85,49 +87,3 @@ jobs:
8587
- name: Run size tests (post-submit)
8688
if: ${{ github.event_name == 'push' }}
8789
run: fireci binary_size
88-
89-
startup_time:
90-
name: Startup Time
91-
if: |
92-
(github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
93-
|| (github.event_name == 'pull_request'
94-
&& github.event.pull_request.head.repo.full_name == github.repository)
95-
runs-on: ubuntu-latest
96-
steps:
97-
- uses: actions/checkout@v3
98-
with:
99-
fetch-depth: 2
100-
submodules: true
101-
- name: Set up JDK 11
102-
uses: actions/setup-java@v2
103-
with:
104-
java-version: 11
105-
distribution: temurin
106-
cache: gradle
107-
- name: Set up Python 3.10
108-
uses: actions/setup-python@v4
109-
with:
110-
python-version: '3.10'
111-
- uses: google-github-actions/auth@v0
112-
with:
113-
credentials_json: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
114-
- uses: google-github-actions/setup-gcloud@v0
115-
- name: Set up fireci
116-
run: pip3 install -e ci/fireci
117-
- name: Add google-services.json
118-
env:
119-
INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
120-
BENCHMARK_APP_LOCATION: health-metrics/benchmark/template/app/google-services.json
121-
run: |
122-
echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > $BENCHMARK_APP_LOCATION
123-
- name: Run startup-time tests (presubmit)
124-
if: ${{ github.event_name == 'pull_request' }}
125-
run: |
126-
git diff --name-only HEAD~1 | \
127-
xargs printf -- '--changed-git-paths %s\n' | \
128-
xargs ./gradlew writeChangedProjects --output-file-path=modules.json
129-
fireci macrobenchmark ci --pull-request --changed-modules-file modules.json
130-
- name: Run startup-time tests (post-submit)
131-
if: ${{ github.event_name == 'push' }}
132-
run: |
133-
fireci macrobenchmark ci --push

0 commit comments

Comments
 (0)