Target branch to receive PR for version 0.2.2

Signed-off-by: David Wood <[email protected]>

RELEASE.md

@@ -36,19 +36,19 @@ Commit this to the main branch so it is ready for including in the release branc
 The `scripts/release-branch.sh` is currently run manually to create the branch and tags as follows:
 
 1. Creates the `releases/vX.Y.Z` from the main branch where `X.Y.Z` are defined in .make.versions
-1. Creates the `vX.Y.Z` branch for PR'ing back into the `releases/vX.Y.Z` branch. 
-1. In the new `vX.Y.Z` branch 
-    1. Nulls out the version suffix in the new branch's `.make.version` file. 
-    1. Applies the unsuffixed versions to the artifacts published from the repo using `make set-versions`..
-    1. Commits and pushes branch 
+1. Creates the `pending-releases/vX.Y.Z` branch for PR'ing back into the `releases/vX.Y.Z` branch. 
+1. In creating the new `pending-releases/vX.Y.Z` branch, we
+    1. Null out the version suffix in the new branch's `.make.version` file. 
+    1. Apply the unsuffixed versions to the artifacts published from the repo using `make set-versions`..
+    1. Commit and push branch 
 1. Creates the `pending-version-change/vX.Y.Z` branch for PR'ing back into the main branch.
 1. In the `pending-version-change/vX.Y.Z` branch
     1. Increments the minor version (i.e. Z+1) and resets the suffix to `dev0` in `.make.versions`.
     1. Commits and pushes branch 
 
 To double-check the version that will be published from the release,
 ```
-git checkout vX.Y.Z 
+git checkout pending-releases/vX.Y.Z 
 make show-version
 ```
 This will print for example, 1.2.3. 
@@ -60,13 +60,13 @@ scripts/release-branch.sh
 ```
 
 After running the script, you should
-1. Create a pull request from branch `vX.Y.Z` into the `releases/vX.Y.Z` branch, and merge.
+1. Create a pull request from branch `pending-releases/vX.Y.Z` into the `releases/vX.Y.Z` branch, and merge.
 2. Use the github web UI to create a git release and tag of the `releases/vX.Y.Z` branch
 3. Create a pull request from branch `pending-version-change/vX.Y.Z` into the main branch, and merge. 
 
 ### Creating the Github Release
 After running the `release-branch.sh` script, to create tag `vX.Y.Z` and branch `releases/vX.Y.Z`
-and PRing/merging `vX.Y.Z` into `releases/vX.Y.Z`.
+and PRing/merging `pending-releases/vX.Y.Z` into `releases/vX.Y.Z`.
 1. Go to the [releases page](https://github.com/IBM/data-prep-kit/releases). 
 1. Select `Draft a new release`
 1. Select target branch `releases/vX.Y.Z`
@@ -79,7 +79,7 @@ and PRing/merging `vX.Y.Z` into `releases/vX.Y.Z`.
 ### Building and Publishing Wheels and Images
 After creating the release and tag on github: 
 
-1. Switch to a release branch (e.g. releases/v1.2.3). 
+1. Switch to a release branch (e.g. `releases/v1.2.3`). 
 1. Be sure you're at the top of the repository (`.../data-prep-kit`)
 1. Optionally, `make show-version` to see the version that will be published
 1. Running the following, either manually or in a git action

scripts/release-branch.sh

@@ -24,7 +24,7 @@ else
     tag=test$version
 fi
 release_branch=releases/$tag
-release_branch_pr=$tag
+release_branch_pr=pending-releases/$tag
 
 # Create a new branch for this version and switch to it
 if [ ! -z "$debug" ]; then
@@ -74,9 +74,9 @@ git commit --no-verify -s -a -m "Initializing branch to PR back into $DEFAULT_BR
 git push 
 
 # Change to the next development version (bumped minor version with suffix).
-micro=$(cat .make.versions | grep '^DPK_MICRO_VERSION=' | sed -e 's/DPK_MICRO_VERSION=\([0-9]*\).*/\1/') 
-micro=$(($micro + 1))
-cat .make.versions | sed -e "s/^DPK_MICRO_VERSION=.*/DPK_MICRO_VERSION=$micro/"  \
+minor=$(cat .make.versions | grep '^DPK_MINOR_VERSION' | sed -e 's/DPK_MINOR_VERSION[ ]*=[ ]*\([0-9]*\).*/\1/') 
+minor=$(($minor + 1))
+cat .make.versions | sed -e "s/^DPK_MINOR_VERSION=.*/DPK_MINOR_VERSION=$minor/"  \
  			 -e "s/^DPK_VERSION_SUFFIX=.*/DPK_VERSION_SUFFIX=.dev0/"  > tt
 mv tt .make.versions
 next_version=$(make show-version)
@@ -88,7 +88,7 @@ make set-versions > /dev/null
 # Push the version change back to the origin
 if [ -z "$debug" ]; then
     echo Committing and pushing version $next_version to $next_version_branch_pr branch.
-    git commit --no-verify -s -a -m "Bump micro version to $next_version" 
+    git commit --no-verify -s -a -m "Bump miinor version to $next_version" 
     #git diff origin/$next_version_branch_pr $next_version_branch_pr 
     git push 
 else