Merge remote-tracking branch 'origin/main' into pb-merge-main7-3

firebase · Jul 3, 2024 · cfacee8 · cfacee8
2 parents a53db1a + eca84fd
commit cfacee8
Show file tree

Hide file tree

Showing 87 changed files with 442 additions and 1,143 deletions.
diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -180,6 +180,9 @@ jobs:
   #   steps:
   #   - uses: actions/checkout@v4
   #   - uses: ruby/setup-ruby@v1
+  #   - uses: actions/setup-python@v4
+  #     with:
+  #      python-version: '3.11'
   #   - name: Setup quickstart
   #     run: scripts/setup_quickstart.sh authentication
   #   - name: Install Secret GoogleService-Info.plist
@@ -188,7 +191,7 @@ jobs:
   #   - name: Build swift quickstart
   #     run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Authentication)
   #   - id: ftl_test
-  #     uses: FirebaseExtended/github-actions/firebase-test-lab@v1.2
+  #     uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
   #     with:
   #       credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
   #       testapp_dir: quickstart-ios/build-for-testing

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -37,19 +37,22 @@ jobs:
         cd "${GITHUB_WORKSPACE}/ReleaseTooling"
         swift run manifest --sdk-repo-url "${GITHUB_WORKSPACE}" --output-file-path ./output.json --for-gha-matrix-generation
         echo "::set-output name=matrix::{\"include\":$( cat output.json )}"
-    - name: Get token
-      run: |
-         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/oss-bot-access.txt.gpg \
-         oss-bot-access.txt "$bot_token_secret"
-         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
-         bot-access.txt "$bot_token_secret"
     - name: Update SpecsTesting repo setup
       run: |
-         ossbotaccess=`cat oss-bot-access.txt`
-         BOT_TOKEN="${ossbotaccess}" test_version="${nightly_version}" sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" local_sdk_repo_dir="${local_sdk_repo_dir}" podspec_repo_branch="${podspec_repo_branch}" scripts/release_testing_setup.sh prerelease_testing
+         test_version="${nightly_version}" \
+           sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" \
+           local_sdk_repo_dir="${local_sdk_repo_dir}" \
+           podspec_repo_branch="${podspec_repo_branch}" \
+           scripts/release_testing_setup.sh prerelease_testing
+      env:
+         BOT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Get token
+      run: |
+         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
+         prerelease-testing-token.txt "$bot_token_secret"
     - name: Clean spec repo
       run: |
-         ossbotaccess=`cat oss-bot-access.txt`
+         ossbotaccess=`cat prerelease-testing-token.txt`
          git clone --quiet https://${ossbotaccess}@github.com/Firebase/SpecsTesting.git "${local_repo}"
          cd "${local_repo}"
          # Remove all unhidden dirs, i.e. all podspec dir from the spec repo.
@@ -61,7 +64,7 @@ jobs:
     - name: Clean Artifacts
       if: ${{ always() }}
       run: |
-        rm -rf oss-bot-access.txt
+        rm -rf prerelease-testing-token.txt
     - uses: actions/upload-artifact@v4
       with:
         name: firebase-ios-sdk
@@ -86,7 +89,7 @@ jobs:
         path: ${{ env.local_sdk_repo_dir }}
     - name: Get token
       run: |
-         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
          bot-access.txt "$bot_token_secret"
     - name: Update SpecsTesting repo
       run: |
@@ -128,7 +131,7 @@ jobs:
         path: ${{ env.local_sdk_repo_dir }}
     - name: Get token
       run: |
-         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
          bot-access.txt "$bot_token_secret"
     - name: Update SpecsTesting repo
       run: |
@@ -166,15 +169,18 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get token
       run: |
-         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/oss-bot-access.txt.gpg \
-         oss-bot-access.txt "$bot_token_secret"
-         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
          bot-access.txt "$bot_token_secret"
     - name: Update SpecsTesting repo setup
       run: |
-         ossbotaccess=`cat oss-bot-access.txt`
          # Update/create a nightly tag to the head of the main branch.
-         BOT_TOKEN="${ossbotaccess}" test_version="${nightly_version}" sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" local_sdk_repo_dir="${local_sdk_repo_dir}" podspec_repo_branch="${podspec_repo_branch}" scripts/release_testing_setup.sh prerelease_testing
+         test_version="${nightly_version}" \
+           sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" \
+           local_sdk_repo_dir="${local_sdk_repo_dir}" \
+           podspec_repo_branch="${podspec_repo_branch}" \
+           scripts/release_testing_setup.sh prerelease_testing
+      env:
+         BOT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Push updated podspecs
       run: |
         botaccess=`cat bot-access.txt`
@@ -215,7 +221,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       env:
@@ -233,7 +239,8 @@ jobs:
     - name: Remove data before upload
       env:
         LEGACY: true
-      run: scripts/remove_data.sh config release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh config
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -253,7 +260,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -265,7 +272,8 @@ jobs:
     - name: Test swift quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Authentication false)
     - name: Remove data before upload
-      run: scripts/remove_data.sh authentication release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh authentication
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -287,7 +295,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       env:
@@ -314,7 +322,8 @@ jobs:
     - name: Remove data before upload
       env:
         LEGACY: true
-      run: scripts/remove_data.sh crashlytics release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh crashlytics
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -336,7 +345,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -350,7 +359,8 @@ jobs:
     - name: Test swift quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Database false swift)
     - name: Remove data before upload
-      run: scripts/remove_data.sh database release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh database
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -372,7 +382,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -392,7 +402,8 @@ jobs:
       if: ${{ always() }}
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh DynamicLinks true swift)
     - name: Remove data before upload
-      run: scripts/remove_data.sh dynamiclinks release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh dynamiclinks
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -414,7 +425,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -427,7 +438,8 @@ jobs:
       run: ([ -z $plist_secret ] ||
             scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Firestore false)
     - name: Remove data before upload
-      run: scripts/remove_data.sh firestore release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh firestore
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -452,7 +464,7 @@ jobs:
     # - uses: actions/checkout@v4
     # - uses: ruby/setup-ruby@v1
     # - name: Get token
-    #   run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+    #   run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
     #       bot-access.txt "$bot_token_secret"
     # - name: Setup testing repo and quickstart
     #   run: |
@@ -470,7 +482,8 @@ jobs:
     #   run: ([ -z $plist_secret ] ||
     #         scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Functions true swift)
     # - name: Remove data before upload
-    #   run: scripts/remove_data.sh functions release_testing
+    #   if: ${{ failure() }}
+    #   run: scripts/remove_data.sh functions
     # - uses: actions/upload-artifact@v4
     #   if: ${{ failure() }}
     #   with:
@@ -492,7 +505,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -508,7 +521,8 @@ jobs:
       run: ([ -z $plist_secret ] ||
             scripts/third_party/travis/retry.sh scripts/test_quickstart.sh InAppMessaging true swift)
     - name: Remove data before upload
-      run: scripts/remove_data.sh inappmessaging release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh inappmessaging
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -530,7 +544,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -546,7 +560,8 @@ jobs:
       run: ([ -z $plist_secret ] ||
             scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Messaging false swift)
     - name: Remove data before upload
-      run: scripts/remove_data.sh messaging release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh messaging
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -566,7 +581,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -578,7 +593,8 @@ jobs:
     - name: Test Swift Quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Config true)
     - name: Remove data before upload
-      run: scripts/remove_data.sh config release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh config
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -601,7 +617,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -615,7 +631,8 @@ jobs:
     - name: Test swift quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true swift)
     - name: Remove data before upload
-      run: scripts/remove_data.sh storage release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh storage
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
@@ -637,7 +654,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Get token
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \
           bot-access.txt "$bot_token_secret"
     - name: Setup testing repo and quickstart
       run: |
@@ -652,7 +669,8 @@ jobs:
     - name: Test swift quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Performance true swift)
     - name: Remove data before upload
-      run: scripts/remove_data.sh performance release_testing
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh performance
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with: