Skip to content

Commit 881518c

Browse files
authored
Update release test to generate testing repo with Cocoapods tags. (#7769)
* Update release workflow to generate an RC. * Update pod source.
1 parent ab1374f commit 881518c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Update SpecsReleasing repo setup
3535
run: |
3636
ossbotaccess=`cat oss-bot-access.txt`
37-
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
37+
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
3838
- name: Update SpecsReleasing repo
3939
run: |
4040
botaccess=`cat bot-access.txt`

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
- name: Update SpecsTesting repo setup
3535
run: |
3636
ossbotaccess=`cat oss-bot-access.txt`
37-
BOT_TOKEN="${ossbotaccess}" scripts/release_testing_setup.sh nightly_testing
37+
BOT_TOKEN="${ossbotaccess}" scripts/release_testing_setup.sh release_testing
3838
- name: Update SpecsTesting repo
3939
run: |
4040
botaccess=`cat bot-access.txt`
4141
cd scripts/create_spec_repo/
4242
swift build
4343
pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/FirebasePrivate/SpecsTesting.git
44-
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}"
44+
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/"
4545
- name: Clean Artifacts
4646
if: ${{ always() }}
4747
run: |

scripts/release_testing_setup.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ release_branch=$(git branch -r -l "origin/release-${test_version}")
3838
if [ -z $release_branch ];then
3939
echo "release-${test_version} branch does not exist in the sdk repo."
4040
# Get substring before the last ".", e.g. "release-7.0.0" -> "release-7.0"
41-
test_version=${test_version%.*}
42-
echo "search for release-${test_version} branch."
43-
release_branch=$(git branch -r -l "origin/release-${test_version}")
41+
minor_test_version=${test_version%.*}
42+
echo "search for release-${minor_test_version} branch."
43+
release_branch=$(git branch -r -l "origin/release-${minor_test_version}")
4444
if [ -z $release_branch ];then
45-
echo "release-${test_version} branch does not exist in the sdk repo."
45+
echo "release-${minor_test_version} branch does not exist in the sdk repo."
4646
exit 1
4747
fi
4848
fi
@@ -54,16 +54,16 @@ fi
5454

5555
git config --global user.email "[email protected]"
5656
git config --global user.name "google-oss-bot"
57-
if [ "$TESTINGMODE" = "nightly_testing" ]; then
58-
tag_version="nightly-test-${test_version}"
59-
echo "A new tag, ${tag_version},for nightly release testing will be created."
60-
fi
61-
if [ "$TESTINGMODE" = "RC_testing" ]; then
57+
if [ "$TESTINGMODE" = "release_testing" ]; then
58+
# Latest Cocoapods tag on the repo, e.g. Cocoapods-7.9.0
59+
latest_cocoapods_tag=$(git tag -l --sort=-version:refname CocoaPods-*[0-9] | head -n 1 )
60+
echo "Podspecs tags of Nightly release testing will be updated to ${latest_cocoapods_tag}."
61+
# Update source and tag, e.g. ":tag => 'CocoaPods-' + s.version.to_s" to
62+
# ":tag => 'CocoaPods-7.9.0'"
63+
sed -i "" "s/\s*:tag.*/:tag => '${latest_cocoapods_tag}'/" *.podspec
64+
elif [ "$TESTINGMODE" = "prerelease_testing" ]; then
6265
tag_version="CocoaPods-${test_version}.nightly"
6366
echo "A new tag, ${tag_version},for prerelease testing will be created."
64-
fi
65-
# Update a tag.
66-
if [ -n "$tag_version" ]; then
6767
git checkout "${podspec_repo_branch}"
6868
set +e
6969
# If tag_version is new to the remote, remote cannot delete a non-existent

0 commit comments

Comments
 (0)