@@ -48,14 +48,14 @@ if [ -z $release_branch ];then
48
48
fi
49
49
50
50
if [ -z $podspec_repo_branch ]; then
51
- # Get release branch, release-X.Y.Z.
52
- podspec_repo_branch=$( echo $release_branch | sed -n ' s/\s*origin\/ //p' )
51
+ # Get release branch, origin/ release-X.Y.Z.
52
+ podspec_repo_branch=$( echo $release_branch | sed -n ' s/[[:blank:]] //p' )
53
53
fi
54
54
55
55
git config --global user.email
" [email protected] "
56
56
git config --global user.name " google-oss-bot"
57
+ git checkout " ${podspec_repo_branch} "
57
58
if [ " $TESTINGMODE " = " release_testing" ]; then
58
- git checkout " ${release_branch} "
59
59
# Latest Cocoapods tag on the repo, e.g. Cocoapods-7.9.0
60
60
latest_cocoapods_tag=$( git tag -l --sort=-version:refname CocoaPods-* [0-9] | head -n 1 )
61
61
echo " Podspecs tags of Nightly release testing will be updated to ${latest_cocoapods_tag} ."
@@ -65,7 +65,6 @@ if [ "$TESTINGMODE" = "release_testing" ]; then
65
65
elif [ " $TESTINGMODE " = " prerelease_testing" ]; then
66
66
tag_version=" CocoaPods-${test_version} .nightly"
67
67
echo " A new tag, ${tag_version} ,for prerelease testing will be created."
68
- git checkout " ${podspec_repo_branch} "
69
68
set +e
70
69
# If tag_version is new to the remote, remote cannot delete a non-existent
71
70
# tag, so error is allowed here.
0 commit comments