chore(ci): change release vars (#578)

codebuild/release/release-prod.yml

@@ -4,6 +4,8 @@
 version: 0.2
 
 env:
+  variables:
+    BRANCH: "master"
   secrets-manager:
     GPG_KEY: Maven-GPG-Keys-Credentials:Keyname
     GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase
@@ -16,6 +18,7 @@ phases:
       java: corretto11
   pre_build:
     commands:
+      - git checkout $BRANCH
       - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml
       - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
       - tar -xvf ~/mvn_gpg.tgz -C ~

codebuild/release/upload_artifacts.yml

@@ -14,6 +14,7 @@ phases:
   pre_build:
     commands:
         # get new project version
+      - git checkout $BRANCH
       - export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
       - git config --global user.name "aws-crypto-tools-ci-bot"
       - git config --global user.email "no-reply@noemail.local"
@@ -24,7 +25,6 @@ phases:
       - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
       - apt update
       - apt install gh
-      - git checkout $BRANCH
   build:
     commands:
       - gh version

codebuild/release/validate-prod.yml

@@ -3,12 +3,18 @@
 
 version: 0.2
 
+env:
+  variables:
+    BRANCH: "master"
+
 phases:
   install:
     runtime-versions:
       java: $JAVA_ENV_VERSION
   pre_build:
     commands:
+      - git checkout $BRANCH
+      - export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
       - git clone https://github.com/aws-samples/busy-engineers-document-bucket.git
       - cd busy-engineers-document-bucket/exercises/java/encryption-context-complete
   build: