Updating PREFIX to SUFFIX in release script (#963)

GoogleCloudPlatform · Oct 18, 2019 · 8210229 · 8210229
1 parent 302aea1
commit 8210229
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/boms/cloud-oss-bom/RELEASING.md b/boms/cloud-oss-bom/RELEASING.md
@@ -32,14 +32,14 @@ problems. If so:
 3. Delete the tag locally:
 
    ```
-   $ git tag -d bom-v2.6.0
-   Deleted tag 'bom-v2.6.0' (was 3b96602)
+   $ git tag -d v2.6.0-bom
+   Deleted tag 'v2.6.0-bom' (was 3b96602)
    ```
 
 4. Push the deleted tag:
 
    ```
-   $ git push origin :bom-v2.6.0
+   $ git push origin :v2.6.0-bom
    To github.com:GoogleCloudPlatform/cloud-opensource-java.git
-   - [deleted]         bom-v2.6.0
+   - [deleted]         v2.6.0-bom
    ```
diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh
@@ -36,9 +36,9 @@ IncrementVersion() {
 
 EchoGreen '===== RELEASE SETUP SCRIPT ====='
 
-PREFIX=$1
+SUFFIX=$1
 
-if [[ "${PREFIX}" != "dependencies" && "${PREFIX}" != "bom" ]]; then
+if [[ "${SUFFIX}" != "dependencies" && "${SUFFIX}" != "bom" ]]; then
   DieUsage
 fi
 
@@ -58,14 +58,14 @@ if [[ $(git status -uno --porcelain) ]]; then
 fi
 
 # Checks out a new branch for this version release (eg. 1.5.7).
-git checkout -b ${PREFIX}-${VERSION}
+git checkout -b ${VERSION}-${SUFFIX}
 
 # Updates the pom.xml with the version to release.
 mvn versions:set versions:commit -DnewVersion=${VERSION}
 
 # Tags a new commit for this release.
-git commit -am "preparing release ${PREFIX}-${VERSION}"
-git tag ${PREFIX}-v${VERSION}
+git commit -am "preparing release ${VERSION}-${SUFFIX}"
+git tag v${VERSION}-${SUFFIX}
 
 # Updates the pom.xml with the next snapshot version.
 # For example, when releasing 1.5.7, the next snapshot version would be 1.5.8-SNAPSHOT.
@@ -79,9 +79,9 @@ mvn versions:set versions:commit -DnewVersion=${NEXT_SNAPSHOT}
 git commit -am "${NEXT_SNAPSHOT}"
 
 # Pushes the tag and release branch to Github.
-git push origin ${PREFIX}-v${VERSION}
-git push --set-upstream origin ${PREFIX}-${VERSION}
+git push origin v${VERSION}-${SUFFIX}
+git push --set-upstream origin ${VERSION}-${SUFFIX}
 
 # File a PR on Github for the new branch. Have someone LGTM it, which gives you permission to continue.
 EchoGreen 'File a PR for the new release branch:'
-echo https://github.com/GoogleCloudPlatform/cloud-opensource-java/compare/${PREFIX}-${VERSION}
+echo https://github.com/GoogleCloudPlatform/cloud-opensource-java/compare/${VERSION}-${SUFFIX}