Merge remote-tracking branch 'origin/main' into tomandersen/or_query

Author: tom-andersen

.github/workflows/build-report.yml

@@ -0,0 +1,91 @@
+name: Generate Test Report Table
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 15 * * *"  # 3pm UTC = 7am PST / 8am PDT, 6 hours after testapps run
+
+env:
+  GITHUB_TOKEN: ${{ github.token }}
+  numDays: 7
+  numDaysExtended: 30
+  numTestsSummary: 10
+
+jobs:
+  generate-report:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Setup python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Install Desktop SDK prerequisites
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 15
+        max_attempts: 3
+        command: |
+          python3 scripts/gha/install_prereqs_desktop.py --gha_build
+          python3 -m pip install requests python-dateutil progress attrs
+    - name: Fetch GitHub jobs (with retry)
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 20
+        max_attempts: 3
+        shell: bash
+        command: python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDays }} --write_cache build_status_short.cache
+    - name: Fetch extended GitHub jobs (with retry)
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 80
+        max_attempts: 3
+        shell: bash
+        command: python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDaysExtended }} --write_cache build_status.cache
+    - name: Generate report files
+      run: |
+        python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDays }} --output_markdown --read_cache build_status_short.cache > report_short.md
+        python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDaysExtended }} --output_markdown --read_cache build_status.cache > report_extended.md
+        python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDaysExtended }} --output_markdown --read_cache build_status.cache --report=test_summary --summary_count=${{ env.numTestsSummary }} > test_summary.md
+        python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDays }} --nooutput_header --read_cache build_status_short.cache > report.txt
+    - name: Generate comment string
+      run: |
+        echo -n > comment.md
+        cat >> comment.md <<EOF
+        EOF
+        cat report_short.md >> comment.md
+        cat >> comment.md <<EOF
+
+        <details><summary>View extended history (last ${{ env.numDaysExtended }} days)</summary>
+
+        EOF
+        cat report_extended.md >> comment.md
+        cat >> comment.md <<EOF
+        </details>
+        <details><summary>Top ${{ env.numTestsSummary }} flakes/failures (last ${{ env.numDaysExtended }} days)</summary>
+
+        EOF
+        cat test_summary.md >> comment.md
+        cat >> comment.md <<EOF
+        </details>
+        <details><summary>📄</summary><pre>
+        EOF
+        cat report.txt >> comment.md
+        cat >> comment.md <<EOF
+        </pre></details>
+
+        ***
+
+        EOF
+    - name: Show comment string
+      run: |
+        cat comment.md
+    - name: Update GitHub issue (with retry)
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 5
+        max_attempts: 3
+        shell: bash
+        command: python3 scripts/gha/update_issue_comment.py --token ${{ github.token }} --issue_title '[C++] Nightly Integration Testing Report' --start_tag build-dashboard-comment-start --end_tag build-dashboard-comment-end < comment.md

.github/workflows/integration_tests.yml

@@ -190,12 +190,15 @@ jobs:
           apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
         elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
           # at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.
+          echo "::warning ::Running Firestore nightly tests"
           apis="firestore"
         else
+          echo "::warning ::Running main nightly tests"
           apis=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k apis -o "${{github.event.inputs.apis}}" ${TEST_MATRIX_PARAM} )
         fi
         if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
-          # at 3am PST/4am PDT. Running  firestore desktop integration test aginst tip-of-tree ios repo
+          # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo
+          echo "::warning ::Running against Firestore tip-of-tree"
           matrix_platform="Desktop"
           matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12")
         else

.github/workflows/reviewer-roulette.yml

@@ -5,7 +5,7 @@ on:
     types: [ labeled ]
 
 env:
-  reviewerList: "jonsimantov a-maurice DellaBitta cynthiajoan chkuang-g AlmostMatt"
+  reviewerList: "jonsimantov a-maurice cynthiajoan chkuang-g AlmostMatt"
 
 jobs:
   assign_random_reviewer:

.gitignore

@@ -1,5 +1,9 @@
 .DS_Store
 
+# CMake "user presets" files
+# https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html
+CMakeUserPresets.json
+
 # Python byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -10,6 +14,9 @@ __pycache__/
 **/build/
 **/.externalNativeBuild/
 
+### IDE generated files
+.vscode/
+
 # Unencrypted secret files
 google-services.json
 GoogleService-Info.plist

Android/firebase_dependencies.gradle

@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
+  'gma' : ['com.google.android.gms:play-services-ads:22.1.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -158,7 +158,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.0.0')
+      implementation platform('com.google.firebase:firebase-bom:32.1.1')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

analytics/integration_test/Podfile

@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Analytics', '10.9.0'
+  pod 'Firebase/Analytics', '10.11.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '10.9.0'
+  pod 'Firebase/Analytics', '10.11.0'
 end
 
 post_install do |installer|

analytics/ios_headers/FIREventNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.9.0.
+// Copied from Firebase Analytics iOS SDK 10.11.0.
 
 /// @file FIREventNames.h
 ///

analytics/ios_headers/FIRParameterNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.9.0.
+// Copied from Firebase Analytics iOS SDK 10.11.0.
 
 /// @file FIRParameterNames.h
 ///

analytics/ios_headers/FIRUserPropertyNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.9.0.
+// Copied from Firebase Analytics iOS SDK 10.11.0.
 
 /// @file FIRUserPropertyNames.h
 ///

app/CMakeLists.txt

@@ -549,6 +549,7 @@ if (IOS)
     ${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma.h
     ${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/ad_view.h
     ${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/interstitial_ad.h
+    ${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/internal/native_ad.h
     ${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/rewarded_ad.h
     ${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/types.h)
   set(installations_HDRS