Quellcode durchsuchen

Update release test to generate testing repo with Cocoapods tags. (#7769)

* Update release workflow to generate an RC.

* Update pod source.
Gran vor 5 Jahren
Ursprung
Commit
881518c82a
3 geänderte Dateien mit 15 neuen und 15 gelöschten Zeilen
  1. 1 1
      .github/workflows/prerelease.yml
  2. 2 2
      .github/workflows/release.yml
  3. 12 12
      scripts/release_testing_setup.sh

+ 1 - 1
.github/workflows/prerelease.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Update SpecsReleasing 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 RC_testing
+         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
     - name: Update SpecsReleasing repo
       run: |
         botaccess=`cat bot-access.txt`

+ 2 - 2
.github/workflows/release.yml

@@ -34,14 +34,14 @@ jobs:
     - name: Update SpecsTesting repo setup
       run: |
          ossbotaccess=`cat oss-bot-access.txt`
-         BOT_TOKEN="${ossbotaccess}" scripts/release_testing_setup.sh nightly_testing
+         BOT_TOKEN="${ossbotaccess}" scripts/release_testing_setup.sh release_testing
     - name: Update SpecsTesting repo
       run: |
         botaccess=`cat bot-access.txt`
         cd scripts/create_spec_repo/
         swift build
         pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/FirebasePrivate/SpecsTesting.git
-        BOT_TOKEN="${botaccess}"  .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}"
+        BOT_TOKEN="${botaccess}"  .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --pod-sources 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting' --pod-sources "https://github.com/firebase/SpecsStaging.git" --pod-sources "https://cdn.cocoapods.org/"
     - name: Clean Artifacts
       if: ${{ always() }}
       run: |

+ 12 - 12
scripts/release_testing_setup.sh

@@ -38,11 +38,11 @@ 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."
   # 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}")
+  minor_test_version=${test_version%.*}
+  echo "search for release-${minor_test_version} branch."
+  release_branch=$(git branch -r -l "origin/release-${minor_test_version}")
   if [ -z $release_branch ];then
-    echo "release-${test_version} branch does not exist in the sdk repo."
+    echo "release-${minor_test_version} branch does not exist in the sdk repo."
     exit 1
   fi
 fi
@@ -54,16 +54,16 @@ fi
 
 git config --global user.email "google-oss-bot@example.com"
 git config --global user.name "google-oss-bot"
-if [ "$TESTINGMODE" = "nightly_testing" ]; then
-  tag_version="nightly-test-${test_version}"
-  echo "A new tag, ${tag_version},for nightly release testing will be created."
-fi
-if [ "$TESTINGMODE" = "RC_testing" ]; then
+if [ "$TESTINGMODE" = "release_testing" ]; then
+  # Latest Cocoapods tag on the repo, e.g. Cocoapods-7.9.0
+  latest_cocoapods_tag=$(git tag -l --sort=-version:refname CocoaPods-*[0-9] | head -n 1 )
+  echo "Podspecs tags of Nightly release testing will be updated to ${latest_cocoapods_tag}."
+  # Update source and tag, e.g.  ":tag => 'CocoaPods-' + s.version.to_s" to
+  # ":tag => 'CocoaPods-7.9.0'"
+  sed  -i "" "s/\s*:tag.*/:tag => '${latest_cocoapods_tag}'/" *.podspec
+elif [ "$TESTINGMODE" = "prerelease_testing" ]; then
   tag_version="CocoaPods-${test_version}.nightly"
   echo "A new tag, ${tag_version},for prerelease testing will be created."
-fi
-# Update a tag.
-if [ -n "$tag_version" ]; then
   git checkout "${podspec_repo_branch}"
   set +e
   # If tag_version is new to the remote, remote cannot delete a non-existent