From 6cfc7a28104e1a4849e95a076bd49534c2b0da9d Mon Sep 17 00:00:00 2001
From: Gran <ollkorrect999@gmail.com>
Date: Wed, 14 Oct 2020 18:41:21 -0700
Subject: [PATCH] Add manual trigger and update catching branch version.
 (#6732)

---
 .github/workflows/prerelease.yml | 26 ++++++++++++++------------
 .github/workflows/release.yml    | 25 +++++++++++++------------
 scripts/release_testing_setup.sh |  9 ++++++++-
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 4ac592b894e..ad442cf0726 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
     - '.github/workflows/prerelease.yml'
+  workflow_dispatch:
   schedule:
     # Run every day at 11pm (PST) - cron uses UTC times
     - cron:  '0 7 * * *'
@@ -11,7 +12,7 @@ on:
 jobs:
   buildup_SpecsReleasing_repo:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     env:
       bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       local_repo: specstesting
@@ -44,7 +45,8 @@ jobs:
 
   abtesting_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
+
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -78,7 +80,7 @@ jobs:
 
   auth_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -112,7 +114,7 @@ jobs:
 
   crashlytics_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -155,7 +157,7 @@ jobs:
 
   database_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -193,7 +195,7 @@ jobs:
 
   dynamiclinks_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -237,7 +239,7 @@ jobs:
 
   firestore_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -274,7 +276,7 @@ jobs:
 
   functions_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -316,7 +318,7 @@ jobs:
 
   inappmessaging_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -356,7 +358,7 @@ jobs:
 
   messaging_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -396,7 +398,7 @@ jobs:
 
   remoteconfig_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -430,7 +432,7 @@ jobs:
 
   storage_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsReleasing_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 484431228d7..e203936a548 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,7 @@ on:
     paths:
     - '.github/workflows/release.yml'
     - 'scripts/create_spec_repo/*'
+  workflow_dispatch:
   schedule:
     # Run every day at 11pm (PST) - cron uses UTC times
     - cron:  '0 7 * * *'
@@ -12,7 +13,7 @@ on:
 jobs:
   buildup_SpecsTesting_repo:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     env:
       bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       local_repo: specstesting
@@ -47,7 +48,7 @@ jobs:
 
   abtesting_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -81,7 +82,7 @@ jobs:
 
   auth_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -115,7 +116,7 @@ jobs:
 
   crashlytics_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -158,7 +159,7 @@ jobs:
 
   database_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -196,7 +197,7 @@ jobs:
 
   dynamiclinks_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -240,7 +241,7 @@ jobs:
 
   firestore_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -277,7 +278,7 @@ jobs:
 
   functions_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -319,7 +320,7 @@ jobs:
 
   inappmessaging_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -359,7 +360,7 @@ jobs:
 
   messaging_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -399,7 +400,7 @@ jobs:
 
   remoteconfig_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -433,7 +434,7 @@ jobs:
 
   storage_quickstart:
     # Don't run on private repo unless it is a PR.
-    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
+    if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     needs: buildup_SpecsTesting_repo
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
diff --git a/scripts/release_testing_setup.sh b/scripts/release_testing_setup.sh
index af434ef57d3..5013bcc2032 100755
--- a/scripts/release_testing_setup.sh
+++ b/scripts/release_testing_setup.sh
@@ -33,7 +33,14 @@ test_version=$(git tag -l --sort=-version:refname CocoaPods-*[0-9] | head -n 1 |
 release_branch=$(git branch -r -l "origin/release-${test_version}")
 if [ -z $release_branch ];then
   echo "release-${test_version} branch does not exist in the sdk repo."
-  exit 1
+  # Get substring before the last ".", e.g. "release-7.0.0" -> "release-7.0"
+  test_version=${test_version%.*}
+  echo "search for release-${test_version} branch."
+  release_branch=$(git branch -r -l "origin/release-${test_version}")
+  if [ -z $release_branch ];then
+    echo "release-${test_version} branch does not exist in the sdk repo."
+    exit 1
+  fi
 fi
 
 # Get release branch, release-X.Y.Z.