Merge remote-tracking branch 'upstream/main' into compnerd/swift

Author: compnerd

.github/workflows/build-report.yml

@@ -3,7 +3,7 @@ name: Generate Test Report Table
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 15 * * *"  # 3pm UTC = 7am PST / 8am PDT, 6 hours after testapps run
+    - cron: "0 21 * * *"  # 9pm UTC = 1pm PST / 2pm PDT, 12 hours after testapps run
 
 env:
   GITHUB_TOKEN: ${{ github.token }}

.github/workflows/checks.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install prerequisites
         run: python scripts/gha/install_prereqs_desktop.py
       - name: log clang format version
@@ -57,7 +57,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install prerequisites
         run: |
           python scripts/gha/install_prereqs_desktop.py
@@ -111,16 +111,19 @@ jobs:
       - name: Check whether release notes have been updated
         # Skip this if the PR has the skipReleaseNotes label or if it's a merge to other than main.
         if: ${{!contains(github.event.pull_request.labels.*.name, env.skipReleaseNotesLabel) && (github.event.pull_request.base.ref == 'main')}}
+        env:
+          HEAD_REF: ${{github.event.pull_request.head.ref}}
+          BASE_REF: ${{github.event.pull_request.base.ref}}
         run: |
           set -e
           # Filename to check.
           README_FILE=release_build_files/readme.md
           # Determine the github merge base - same logic as integration_tests.yml
           # "git merge-base main branch_name" will give the common ancestor of both branches.
-          MERGE_BASE=$(git merge-base origin/${{github.event.pull_request.head.ref}} origin/${{github.event.pull_request.base.ref}} || true)
+          MERGE_BASE=$(git merge-base "origin/${HEAD_REF}" "origin/${BASE_REF}" || true)
           # If MERGE_BASE can't be determined, ignore this check, something odd is going on.
           if [[ -n "${MERGE_BASE}" ]]; then
-            DIFF_RESULT=$(git diff --name-only "origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}" -- "${README_FILE}")
+            DIFF_RESULT=$(git diff --name-only "origin/${HEAD_REF}..${MERGE_BASE}" -- "${README_FILE}")
             if [[ "${DIFF_RESULT}" != "${README_FILE}" ]]; then
               echo "::error ::Please update release notes (${README_FILE}) or add '${{env.skipReleaseNotesLabel}}' label."
               exit 1

.github/workflows/checks_secure.yml

@@ -31,7 +31,7 @@ jobs:
         if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install prerequisites
         if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
         run: pip install -r scripts/gha/python_requirements.txt

.github/workflows/cpp-packaging.yml

@@ -97,7 +97,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: Fetch and build binutils
         run: |
@@ -207,7 +207,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: install prerequisites
         run: sdk-src/build_scripts/ios/install_prereqs.sh
@@ -310,7 +310,7 @@ jobs:
         architecture: ["x64", "x86", "arm64"]
         msvc_runtime: ["static", "dynamic"]
         linux_abi: ["legacy", "c++11"]
-        python_version: [3.7]
+        python_version: [3.8]
         include:
         - os: windows-latest
           vcpkg_triplet_suffix: "windows-static"
@@ -518,7 +518,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: Install prerequisites
         run: |
@@ -837,7 +837,7 @@ jobs:
     - name: Setup python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.7'
+        python-version: '3.8'
     - name: Use expanded matrix
       if: github.event_name == 'schedule' || github.event.inputs.use_expanded_matrix == '1'
       run: |
@@ -893,3 +893,34 @@ jobs:
             -s 10 \
             -A ${verbose_flag}
         fi
+
+
+  attempt_retry:
+    name: "attempt-retry"
+    needs: [trigger_integration_tests]
+    runs-on: ubuntu-20.04
+    if: ${{ failure() && !cancelled() && github.event_name == 'schedule' }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      - name: Install python deps
+        run: pip install -r scripts/gha/python_requirements.txt
+      # The default token can't run workflows, so get an alternate token.
+      - name: Generate token for GitHub API
+        uses: tibdex/github-app-token@v1
+        id: generate-token
+        with:
+          app_id: ${{ secrets.WORKFLOW_TRIGGER_APP_ID }}
+          private_key: ${{ secrets.WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
+      - name: Retry failed tests
+        run: |
+          echo "::warning ::Attempting to retry failed jobs"
+          python scripts/gha/trigger_workflow.py -t ${{ steps.generate-token.outputs.token }} \
+          -w retry-test-failures.yml \
+          -p run_id ${{ github.run_id }} \
+          -s 10 \
+          -A

.github/workflows/desktop.yml

@@ -343,10 +343,10 @@ jobs:
           if [[ "${{ job.status }}" != "success" ]]; then
             exit 1
           fi
-      - name: Set up Node (16)
+      - name: Set up Node (18)
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: Setup Firestore Emulator
         uses: nick-invision/retry@v2
         with:

.github/workflows/integration_tests.yml

@@ -46,7 +46,7 @@ env:
   triggerLabelPrefix: "tests-requested: "
   triggerLabelFull: "tests-requested: full"
   triggerLabelQuick: "tests-requested: quick"
-  pythonVersion: '3.7'
+  pythonVersion: '3.8'
   xcodeVersion: '14.1'
   artifactRetentionDays: 2
   GITHUB_TOKEN: ${{ github.token }}
@@ -164,6 +164,9 @@ jobs:
         shell: bash
         command: pip install -r scripts/gha/python_requirements.txt
     - id: matrix_config
+      env:
+        HEAD_REF: ${{github.event.pull_request.head.ref}}
+        BASE_REF: ${{github.event.pull_request.base.ref}}
       run: |
         if [[ "${{ steps.set_outputs.outputs.requested_tests }}" == "expanded" ]]; then
           TEST_MATRIX_PARAM=-e=1
@@ -174,12 +177,12 @@ jobs:
         elif [[ "${{ steps.set_outputs.outputs.requested_tests }}" == "auto" ]]; then
           # auto-diff only apply when running in a PR.
           # diff against the PR's base. "git merge-base main branch_name" will give the common ancestor of both branches.
-          MERGE_BASE=$(git merge-base origin/${{github.event.pull_request.head.ref}} origin/${{github.event.pull_request.base.ref}} || true)
+          MERGE_BASE=$(git merge-base "origin/${HEAD_REF}" "origin/${BASE_REF}" || true)
           # If origin/<branch> is no longer valid, then just run all tests.
           if [[ -n "${MERGE_BASE}" ]]; then
-            echo "::warning ::Auto-diff origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}"
-            git diff --name-only origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}
-            TEST_MATRIX_PARAM="--auto_diff origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}"
+            echo "::warning ::Auto-diff origin/${HEAD_REF}..${MERGE_BASE}"
+            git diff --name-only "origin/${HEAD_REF}..${MERGE_BASE}"
+            TEST_MATRIX_PARAM="--auto_diff origin/${HEAD_REF}..${MERGE_BASE}"
           fi
         fi
 
@@ -188,12 +191,13 @@ jobs:
         if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
           # at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
           apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
+          echo "::warning ::Running main nightly tests"
         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"
+          echo "::warning ::Running pull request 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
@@ -762,17 +766,22 @@ jobs:
           timeout_minutes: 15
           max_attempts: 3
           command: scripts/gha/install_test_workflow_prereqs.sh -p Desktop -t true -a '${{ matrix.arch }}' -s '${{ matrix.ssl_variant }}'
-      - name: Set up Node (16)
+      - name: Set up Node (18)
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: Setup Firestore Emulator
         uses: nick-invision/retry@v2
         with:
           shell: bash
           timeout_minutes: 5
           max_attempts: 3
-          command: npm install -g firebase-tools     
+          command: npm install firebase-tools     
+      - name: Add firebase-tools to PATH
+        shell: bash
+        run: |
+          echo "$(npm root)" >> $GITHUB_PATH
+          echo "$(npm root)/.bin" >> $GITHUB_PATH
       - name: Setup java
         uses: actions/setup-java@v3
         with:
@@ -983,7 +992,7 @@ jobs:
   test_android:
     name: test-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}
     needs: [check_and_prepare, build_android]
-    runs-on: macos-12
+    runs-on: ubuntu-20.04
     if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Android') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
     strategy:
       fail-fast: false
@@ -1020,7 +1029,7 @@ jobs:
         id: device-info
         run: |
           echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_device_type)" >> $GITHUB_OUTPUT
-          echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_ftl_device)" >> $GITHUB_OUTPUT
+          echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT
       - name: Setup java 8 for test_simulator.py
         uses: actions/setup-java@v3
         with:
@@ -1037,15 +1046,17 @@ jobs:
             --ci
       - id: ftl_test
         if: steps.device-info.outputs.device_type == 'ftl'
-        uses: FirebaseExtended/github-actions/firebase-test-lab@v1.2
-        timeout-minutes: 90
+        uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
+        timeout-minutes: 120
         with:
           credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
           testapp_dir: testapps
           test_type: "game-loop"
-          test_devices: ${{ steps.device-info.outputs.device }}
+          test_devices: '${{ steps.device-info.outputs.device }}'
+          test_device_selection: random
           max_attempts: 3
           validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py
+          additional_flags: '--client-details matrixLabel=android-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.android_device }}'
       - name: Read FTL Test Result
         if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }}
         shell: bash
@@ -1147,11 +1158,11 @@ jobs:
         id: device-info
         run: |
           echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.ios_device }} -get_device_type)" >> $GITHUB_OUTPUT
-          echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.ios_device }} -get_ftl_device)" >> $GITHUB_OUTPUT
-      - name: Set up Node (16)
+          echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.ios_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT
+      - name: Set up Node (18)
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: Setup java for Firestore emulator
         uses: actions/setup-java@v3
         with:
@@ -1164,7 +1175,13 @@ jobs:
           shell: bash
           timeout_minutes: 5
           max_attempts: 3
-          command: npm install -g firebase-tools     
+          command: npm install firebase-tools     
+      - name: Add firebase-tools to PATH
+        if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
+        shell: bash
+        run: |
+          echo "$(npm root)" >> $GITHUB_PATH
+          echo "$(npm root)/.bin" >> $GITHUB_PATH
       - name: Start Firestore Emulator
         if: steps.device-info.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
@@ -1180,15 +1197,17 @@ jobs:
             --ci
       - id: ftl_test
         if: steps.device-info.outputs.device_type == 'ftl'
-        uses: FirebaseExtended/github-actions/firebase-test-lab@v1.2
+        uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
         timeout-minutes: 90
         with:
           credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
           testapp_dir: testapps
           test_type: "game-loop"
-          test_devices: ${{ steps.device-info.outputs.device }}
+          test_devices: '${{ steps.device-info.outputs.device }}'
+          test_device_selection: random
           max_attempts: 3
           validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py
+          additional_flags: '--client-details matrixLabel=ios-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.ios_device }}'
       - name: Read FTL Test Result
         if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }}
         shell: bash
@@ -1283,7 +1302,13 @@ jobs:
           shell: bash
           timeout_minutes: 5
           max_attempts: 3
-          command: npm install -g firebase-tools     
+          command: npm install firebase-tools     
+      - name: Add firebase-tools to PATH
+        if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
+        shell: bash
+        run: |
+          echo "$(npm root)" >> $GITHUB_PATH
+          echo "$(npm root)/.bin" >> $GITHUB_PATH
       - name: Start Firestore Emulator
         if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
@@ -1408,3 +1433,34 @@ jobs:
             ${additional_flags[*]}
       - name: Summarize results into GitHub log
         run: python scripts/gha/summarize_test_results.py --dir test_results --github_log
+
+  attempt_retry:
+    name: "attempt-retry"
+    needs: [check_and_prepare, summarize_results]
+    runs-on: ubuntu-20.04
+    if: ${{ failure() && needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{needs.check_and_prepare.outputs.github_ref}}
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.pythonVersion }}
+      - name: Install python deps
+        run: pip install -r scripts/gha/python_requirements.txt
+      # The default token can't run workflows, so get an alternate token.
+      - name: Generate token for GitHub API
+        uses: tibdex/github-app-token@v1
+        id: generate-token
+        with:
+          app_id: ${{ secrets.WORKFLOW_TRIGGER_APP_ID }}
+          private_key: ${{ secrets.WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
+      - name: Retry failed tests
+        run: |
+          echo "::warning ::Attempting to retry failed tests"
+          python scripts/gha/trigger_workflow.py -t ${{ steps.generate-token.outputs.token }} \
+          -w retry-test-failures.yml \
+          -p run_id ${{ github.run_id }} \
+          -s 10 \
+          -A

.github/workflows/ios.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
           architecture: "x64"
 
       - name: Install prerequisites

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install prerequisites
         run: |
           cd firebase