Skip to content

Commit 7d125ca

Browse files
a-mauricea-maurice
committed
Merge branch 'main' into analytics-dll-secure
2 parents 4ff6bf5 + fd6fcf3 commit 7d125ca

File tree

310 files changed

+962
-32028
lines changed

Some content is hidden

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

310 files changed

+962
-32028
lines changed

‎.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ jobs:
889889
-w integration_tests.yml \
890890
-p test_packaged_sdk ${{ github.run_id }} \
891891
-p use_expanded_matrix ${USE_EXPANDED_MATRIX} \
892-
-p apis "analytics,app_check,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
892+
-p apis "analytics,app_check,auth,database,functions,installations,messaging,remote_config,storage" \
893893
-p test_pull_request nightly-packaging \
894894
-s 10 \
895895
-A ${verbose_flag}

‎.github/workflows/integration_tests.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
required: true
1818
apis:
1919
description: 'CSV of apis to build and test'
20-
default: 'analytics,app_check,auth,database,dynamic_links,firestore,functions,gma,installations,messaging,remote_config,storage,ump'
20+
default: 'analytics,app_check,auth,database,firestore,functions,installations,messaging,remote_config,storage,ump'
2121
required: true
2222
operating_systems:
2323
description: 'CSV of VMs to run on'
@@ -50,7 +50,8 @@ env:
5050
triggerLabelQuick: "tests-requested: quick"
5151
pythonVersion: '3.8'
5252
xcodeVersion: '16.2'
53-
artifactRetentionDays: 2
53+
logArtifactRetentionDays: 90
54+
binaryArtifactRetentionDays: 7
5455
GITHUB_TOKEN: ${{ github.token }}
5556

5657
jobs:
@@ -185,7 +186,7 @@ jobs:
185186
# list. Then we can use fromJson to define the field in the matrix for the tests job.
186187
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
187188
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
188-
apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage,ump"
189+
apis="analytics,app_check,auth,database,functions,installations,messaging,remote_config,storage,ump"
189190
echo "::warning ::Running main nightly tests"
190191
elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
191192
# at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.
@@ -376,14 +377,14 @@ jobs:
376377
with:
377378
name: testapps-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}
378379
path: testapps-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}
379-
retention-days: ${{ env.artifactRetentionDays }}
380+
retention-days: ${{ env.binaryArtifactRetentionDays }}
380381
- name: Upload Desktop build results artifact
381382
uses: actions/upload-artifact@v4
382383
if: ${{ !cancelled() }}
383384
with:
384385
name: log-artifact-build-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}
385386
path: build-results-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}*
386-
retention-days: ${{ env.artifactRetentionDays }}
387+
retention-days: ${{ env.logArtifactRetentionDays }}
387388
- name: Download log artifacts
388389
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
389390
uses: actions/download-artifact@v4
@@ -496,14 +497,14 @@ jobs:
496497
with:
497498
name: testapps-android-${{ matrix.os }}
498499
path: testapps-android-${{ matrix.os }}
499-
retention-days: ${{ env.artifactRetentionDays }}
500+
retention-days: ${{ env.binaryArtifactRetentionDays }}
500501
- name: Upload Android build results artifact
501502
uses: actions/upload-artifact@v4
502503
if: ${{ !cancelled() }}
503504
with:
504505
name: log-artifact-build-android-${{ matrix.os }}
505506
path: build-results-android-${{ matrix.os }}*
506-
retention-days: ${{ env.artifactRetentionDays }}
507+
retention-days: ${{ env.logArtifactRetentionDays }}
507508
- name: Download log artifacts
508509
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
509510
uses: actions/download-artifact@v4
@@ -604,14 +605,14 @@ jobs:
604605
with:
605606
name: testapps-ios-${{ matrix.os }}
606607
path: testapps-ios-${{ matrix.os }}
607-
retention-days: ${{ env.artifactRetentionDays }}
608+
retention-days: ${{ env.binaryArtifactRetentionDays }}
608609
- name: Upload iOS build results artifact
609610
uses: actions/upload-artifact@v4
610611
if: ${{ !cancelled() }}
611612
with:
612613
name: log-artifact-build-ios-${{ matrix.os }}
613614
path: build-results-ios-${{ matrix.os }}*
614-
retention-days: ${{ env.artifactRetentionDays }}
615+
retention-days: ${{ env.logArtifactRetentionDays }}
615616
- name: Download log artifacts
616617
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
617618
uses: actions/download-artifact@v4
@@ -711,14 +712,14 @@ jobs:
711712
with:
712713
name: testapps-tvos-${{ matrix.os }}
713714
path: testapps-tvos-${{ matrix.os }}
714-
retention-days: ${{ env.artifactRetentionDays }}
715+
retention-days: ${{ env.binaryArtifactRetentionDays }}
715716
- name: Upload tvOS build results artifact
716717
uses: actions/upload-artifact@v4
717718
if: ${{ !cancelled() }}
718719
with:
719720
name: log-artifact-build-tvos-${{ matrix.os }}
720721
path: build-results-tvos-${{ matrix.os }}*
721-
retention-days: ${{ env.artifactRetentionDays }}
722+
retention-days: ${{ env.logArtifactRetentionDays }}
722723
- name: Download log artifacts
723724
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
724725
uses: actions/download-artifact@v4
@@ -848,7 +849,7 @@ jobs:
848849
with:
849850
name: log-artifact-test-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}
850851
path: testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}*
851-
retention-days: ${{ env.artifactRetentionDays }}
852+
retention-days: ${{ env.logArtifactRetentionDays }}
852853
- name: Download log artifacts
853854
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
854855
uses: actions/download-artifact@v4
@@ -963,21 +964,21 @@ jobs:
963964
with:
964965
name: log-artifact-test-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}
965966
path: testapps/test-results-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}*
966-
retention-days: ${{ env.artifactRetentionDays }}
967+
retention-days: ${{ env.logArtifactRetentionDays }}
967968
- name: Upload Android test video artifact
968969
if: ${{ steps.device-info.outputs.device_type == 'virtual' && !cancelled() }}
969970
uses: actions/upload-artifact@v4
970971
with:
971972
name: mobile-simulator-test-video-artifact-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}
972973
path: testapps/video-*-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}.mp4
973-
retention-days: ${{ env.artifactRetentionDays }}
974+
retention-days: ${{ env.binaryArtifactRetentionDays }}
974975
- name: Upload Android test logcat artifact
975976
if: ${{ steps.device-info.outputs.device_type == 'virtual' && !cancelled() }}
976977
uses: actions/upload-artifact@v4
977978
with:
978979
name: mobile-simulator-test-logcat-artifact-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}
979980
path: testapps/logcat-*-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}.txt
980-
retention-days: ${{ env.artifactRetentionDays }}
981+
retention-days: ${{ env.logArtifactRetentionDays }}
981982
- name: Download log artifacts
982983
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
983984
uses: actions/download-artifact@v4
@@ -1149,14 +1150,14 @@ jobs:
11491150
with:
11501151
name: log-artifact-test-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}
11511152
path: testapps/test-results-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}*
1152-
retention-days: ${{ env.artifactRetentionDays }}
1153+
retention-days: ${{ env.logArtifactRetentionDays }}
11531154
- name: Upload iOS test video artifact
11541155
if: ${{ steps.device-info.outputs.device_type == 'virtual' && !cancelled() }}
11551156
uses: actions/upload-artifact@v4
11561157
with:
11571158
name: mobile-simulator-test-video-artifact-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}
11581159
path: testapps/video-*-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}.mp4
1159-
retention-days: ${{ env.artifactRetentionDays }}
1160+
retention-days: ${{ env.binaryArtifactRetentionDays }}
11601161
- name: Download log artifacts
11611162
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
11621163
uses: actions/download-artifact@v4
@@ -1289,14 +1290,14 @@ jobs:
12891290
with:
12901291
name: log-artifact-test-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}
12911292
path: testapps/test-results-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}*
1292-
retention-days: ${{ env.artifactRetentionDays }}
1293+
retention-days: ${{ env.logArtifactRetentionDays }}
12931294
- name: Upload tvOS test video artifact
12941295
if: ${{ !cancelled() }}
12951296
uses: actions/upload-artifact@v4
12961297
with:
12971298
name: mobile-simulator-test-video-artifact-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}
12981299
path: testapps/video-*-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}.mp4
1299-
retention-days: ${{ env.artifactRetentionDays }}
1300+
retention-days: ${{ env.binaryArtifactRetentionDays }}
13001301
- name: Download log artifacts
13011302
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
13021303
uses: actions/download-artifact@v4

‎.github/workflows/update-dependencies.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
updateiOS:
99
description: 'update iOS dependencies?'
1010
default: 1
11-
includeGMA:
12-
description: 'include GMA?'
13-
default: 0
1411
triggerTests:
1512
description: 'trigger tests on PR?'
1613
default: 1
@@ -68,20 +65,16 @@ jobs:
6865
6966
- name: Run update script
7067
run: |
71-
gma_flag=
72-
if [[ ${{ github.event.inputs.includeGMA }} -eq 1 ]]; then
73-
gma_flag="--include_gma"
74-
fi
7568
if [[ ${{ github.event.inputs.updateiOS }} -eq 1 ]]; then
7669
if [[ ${{ github.event.inputs.updateAndroid }} -eq 1 ]]; then
7770
# Update both
7871
echo "Updating all dependencies"
79-
python scripts/update_android_ios_dependencies.py --logfile=${UPDATE_LOGFILE} ${gma_flag}
72+
python scripts/update_android_ios_dependencies.py --logfile=${UPDATE_LOGFILE}
8073
echo "CHOSEN_DEPS=mobile" >> $GITHUB_ENV
8174
else
8275
# Update iOS only
8376
echo "Updating iOS dependencies only"
84-
python scripts/update_android_ios_dependencies.py --skip_android --logfile=${UPDATE_LOGFILE} ${gma_flag}
77+
python scripts/update_android_ios_dependencies.py --skip_android --logfile=${UPDATE_LOGFILE}
8578
echo "CHOSEN_DEPS=iOS" >> $GITHUB_ENV
8679
fi
8780
# iOS: Update Firestore external version to match Firestore Cocoapod version.
@@ -102,7 +95,7 @@ jobs:
10295
# Generate a Podfile for Firebase/Analytics. Use the Specs.git
10396
# source to avoid any propagation delays due to CocoaPods mirror.
10497
echo "source 'https://github.com/CocoaPods/Specs.git'" > Podfile
105-
echo "platform :ios, '14.0'" >> Podfile
98+
echo "platform :ios, '15.0'" >> Podfile
10699
echo "pod 'Firebase/Analytics', '${analytics_version}'" >> Podfile
107100
pod repo update
108101
pod install || true # ignore error since there is no Xcode project
@@ -165,7 +158,7 @@ jobs:
165158
elif [[ ${{ github.event.inputs.updateAndroid }} -eq 1 ]]; then
166159
# Update Android only
167160
echo "Updating Android dependencies only"
168-
python scripts/update_android_ios_dependencies.py --skip_ios --logfile=${UPDATE_LOGFILE} ${gma_flag}
161+
python scripts/update_android_ios_dependencies.py --skip_ios --logfile=${UPDATE_LOGFILE}
169162
echo "CHOSEN_DEPS=Android" >> $GITHUB_ENV
170163
else
171164
echo "::error ::Neither Android nor iOS selected. Exiting."

0 commit comments

Comments
 (0)