From 149e1f7748873b13a7af438665a9968767316255 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Wed, 9 Mar 2022 14:11:48 -0800 Subject: [PATCH] chore(ci): change release vars --- codebuild/release/release-prod.yml | 3 +++ codebuild/release/upload_artifacts.yml | 2 +- codebuild/release/validate-prod.yml | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 6d5e9d835..ec22a30a0 100644 --- a/codebuild/release/release-prod.yml +++ b/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 ~ diff --git a/codebuild/release/upload_artifacts.yml b/codebuild/release/upload_artifacts.yml index 0712e2d65..178ffcb61 100644 --- a/codebuild/release/upload_artifacts.yml +++ b/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>/\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 diff --git a/codebuild/release/validate-prod.yml b/codebuild/release/validate-prod.yml index dc8809eec..c61229c17 100644 --- a/codebuild/release/validate-prod.yml +++ b/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>/\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: