From f89c4c1c7085302e360175e252741ca1482b6ff2 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 16:50:05 -0700 Subject: [PATCH 01/17] chore: adding release-staging to release file --- codebuild/release/release-staging.yml | 2 +- codebuild/release/release.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 codebuild/release/release.yml diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index 4ab16d9b5..6f863cc33 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -46,7 +46,7 @@ phases: -s $SETTINGS_FILE batch: - fast-fail: false + fast-fail: true build-graph: - identifier: release_to_staging - identifier: validate_staging_release_openjdk8 diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml new file mode 100644 index 000000000..d7c30eb4c --- /dev/null +++ b/codebuild/release/release.yml @@ -0,0 +1,12 @@ +## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +## SPDX-License-Identifier: Apache-2.0 + +version: 0.2 + +batch: + fast-fail: true + build-graph: + +# Release and Validate to CodeArtifact + - identifier: release_staging + buildspec: release-staging.yml From 172c78a087c28a79610513f68957ff2d6e426e28 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 17:03:49 -0700 Subject: [PATCH 02/17] chore: removing git commands and version match logic --- codebuild/release/release-staging.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index 6f863cc33..39fae9e67 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -17,13 +17,6 @@ phases: java: openjdk11 pre_build: commands: - - git checkout $COMMIT_ID - - FOUND_VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - - | - if expr ${FOUND_VERSION} != ${VERSION}; then - echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping" - exit 1; - fi - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain $DOMAIN --domain-owner $ACCOUNT --query authorizationToken --output text --region ${REGION}) - export CODEARTIFACT_REPO_URL=https://${DOMAIN}-${ACCOUNT}.d.codeartifact.${REGION}.amazonaws.com/maven/${REPOSITORY} From 1ae2396dc7b06758d9f8f0407246f7ac9cdb5d1f Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 17:26:31 -0700 Subject: [PATCH 03/17] chore: fixing path to correct release file --- codebuild/release/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index d7c30eb4c..3accb7e78 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -9,4 +9,4 @@ batch: # Release and Validate to CodeArtifact - identifier: release_staging - buildspec: release-staging.yml + buildspec: codebuild/release/release-staging.yml From 4d29d77c06607ee7548da7017028c25cb87b52ac Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 17:35:10 -0700 Subject: [PATCH 04/17] chore: adjusting java version --- codebuild/release/release-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index 39fae9e67..cdb85c36b 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -14,7 +14,7 @@ env: phases: install: runtime-versions: - java: openjdk11 + java: corretto11 pre_build: commands: - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml From dbfeabd61c91c5237803cc89876d5fcfc6f280d6 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 18:10:08 -0700 Subject: [PATCH 05/17] chore: adding commit hash to version --- codebuild/release/release-staging.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index cdb85c36b..57cf75cdb 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -24,6 +24,11 @@ phases: - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION" +# See https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html + - echo "Setting version in POM to $VERSION_HASH" + - mvn versions:set -DnewVersion="$VERSION_HASH" --no-transfer-progress + - echo "Version is now $(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p')" - | mvn deploy \ -PpublishingCodeArtifact \ From d87273f8e5f7e4ac3ea968e76b85264e5b4e85d8 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 18:52:08 -0700 Subject: [PATCH 06/17] chore: breaking up release files --- codebuild/release/release-staging.yml | 44 ++------------------------- codebuild/release/release.yml | 43 +++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index 57cf75cdb..f6a00238b 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -1,3 +1,6 @@ +## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +## SPDX-License-Identifier: Apache-2.0 + version: 0.2 env: @@ -42,44 +45,3 @@ phases: -DaltDeploymentRepository=codeartifact::default::$CODEARTIFACT_REPO_URL \ --no-transfer-progress \ -s $SETTINGS_FILE - -batch: - fast-fail: true - build-graph: - - identifier: release_to_staging - - identifier: validate_staging_release_openjdk8 - depend-on: - - release_to_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: openjdk8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:3.0 - - identifier: validate_staging_release_openjdk11 - depend-on: - - release_to_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: openjdk11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:3.0 - - identifier: validate_staging_release_corretto8 - depend-on: - - release_to_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: corretto8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - - identifier: validate_staging_release_corretto11 - depend-on: - - release_to_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: corretto11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index 3accb7e78..e3d16be13 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -7,6 +7,47 @@ batch: fast-fail: true build-graph: -# Release and Validate to CodeArtifact +# Release to CodeArtifact - identifier: release_staging buildspec: codebuild/release/release-staging.yml + +# Validate CodeArtifact with supported JDK and Corretto + - identifier: validate_staging_release_openjdk_8 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: openjdk8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/standard:3.0 + + - identifier: validate_staging_release_openjdk11 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: openjdk11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/standard:3.0 + + - identifier: validate_staging_release_corretto8 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: corretto8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + + - identifier: validate_staging_release_corretto11 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: corretto11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 From 3ef05469677115ef54147328d0132aa9fa364bc6 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 18:58:20 -0700 Subject: [PATCH 07/17] chore: format yml file --- codebuild/release/release.yml | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index e3d16be13..60b25888b 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -14,40 +14,40 @@ batch: # Validate CodeArtifact with supported JDK and Corretto - identifier: validate_staging_release_openjdk_8 depend-on: - - release_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: openjdk8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:3.0 + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: openjdk8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/standard:3.0 - identifier: validate_staging_release_openjdk11 - depend-on: - - release_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: openjdk11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:3.0 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: openjdk11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/standard:3.0 - identifier: validate_staging_release_corretto8 - depend-on: - - release_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: corretto8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: corretto8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - identifier: validate_staging_release_corretto11 - depend-on: - - release_staging - buildspec: codebuild/release/validate-staging.yml - env: - variables: - JAVA_ENV_VERSION: corretto11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + depend-on: + - release_staging + buildspec: codebuild/release/validate-staging.yml + env: + variables: + JAVA_ENV_VERSION: corretto11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 From c3134b4bb0532b7a5a8edb92f2b817bb7b6d9628 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 19:12:46 -0700 Subject: [PATCH 08/17] chore: adding which esdk version to go find --- codebuild/release/validate-staging.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml index ba3b9cd30..6929bf3b1 100644 --- a/codebuild/release/validate-staging.yml +++ b/codebuild/release/validate-staging.yml @@ -27,11 +27,12 @@ phases: mvn verify \ -Pcodeartifact \ -Dcheckstyle.skip \ - -Desdk.version=$VERSION \ + -Desdk.version=$VERSION_HASH \ -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \ -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION \ -Dcodeartifact.token=$CODEARTIFACT_TOKEN \ -Dcodeartifact.url=$CODEARTIFACT_REPO_URL \ --no-transfer-progress \ + -T 4 \ -s $SETTINGS_FILE From 6fd415251a237f81bbddb2db1ee46abfa20bc06a Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 12 Oct 2021 19:23:15 -0700 Subject: [PATCH 09/17] chore: you can't evaluate a variable that does not exist... --- codebuild/release/validate-staging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml index 6929bf3b1..2e14548b9 100644 --- a/codebuild/release/validate-staging.yml +++ b/codebuild/release/validate-staging.yml @@ -16,6 +16,7 @@ phases: java: $JAVA_ENV_VERSION pre_build: commands: + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION" - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml - git clone https://github.com/aws-samples/busy-engineers-document-bucket.git - cd busy-engineers-document-bucket/exercises/java/encryption-context-complete From 91bbe61c0074ed684fe37f1c45e9713fd062ff04 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Wed, 13 Oct 2021 21:34:30 -0700 Subject: [PATCH 10/17] chore: add versioning build --- codebuild/release/release.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index 60b25888b..b45a6d416 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -51,3 +51,13 @@ batch: JAVA_ENV_VERSION: corretto11 JAVA_NUMERIC_VERSION: 11 image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + +# Version Project + - identifier: version + depend-on: + - release_staging + - validate_staging_release_openjdk_8 + - validate_staging_release_openjdk11 + - validate_staging_release_corretto8 + - validate_staging_release_corretto11 + buildspec: codebuild/release/version.yml From 7d7eaac899faa964aa8270c0af027a21c247ba93 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 09:49:54 -0700 Subject: [PATCH 11/17] chore: add version file --- codebuild/release/release.yml | 2 ++ codebuild/release/version.yml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 codebuild/release/version.yml diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index b45a6d416..7c7595a91 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -61,3 +61,5 @@ batch: - validate_staging_release_corretto8 - validate_staging_release_corretto11 buildspec: codebuild/release/version.yml + env: + image: aws/codebuild/standard:5.0 diff --git a/codebuild/release/version.yml b/codebuild/release/version.yml new file mode 100644 index 000000000..1a12479fe --- /dev/null +++ b/codebuild/release/version.yml @@ -0,0 +1,17 @@ +## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +## SPDX-License-Identifier: Apache-2.0 + +version: 0.2 + +env: + variables: + NODE_OPTIONS: "--max-old-space-size=4096" + BRANCH: "master" + git-credential-helper: "yes" + +phases: + install: + commands: + - npm --version + runtime-versions: + nodejs: 14 From 31302293c2c0f7fc7e639bbdab89e2a92d755232 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 10:24:42 -0700 Subject: [PATCH 12/17] chore: add git commands --- codebuild/release/version.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/codebuild/release/version.yml b/codebuild/release/version.yml index 1a12479fe..55314d50e 100644 --- a/codebuild/release/version.yml +++ b/codebuild/release/version.yml @@ -15,3 +15,8 @@ phases: - npm --version runtime-versions: nodejs: 14 + pre_build: + commands: + - git config --global user.name "aws-crypto-tools-ci-bot" + - git config --global user.email "no-reply@noemail.local" + - git checkout $BRANCH From 2f745eb7a0a7e313c6bf71832377d7fb58bac2ee Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 14:14:41 -0700 Subject: [PATCH 13/17] chore: add npm installs --- codebuild/release/version.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/codebuild/release/version.yml b/codebuild/release/version.yml index 55314d50e..1913ec1c7 100644 --- a/codebuild/release/version.yml +++ b/codebuild/release/version.yml @@ -12,7 +12,11 @@ env: phases: install: commands: - - npm --version + - npm install --save-dev semantic-release + - npm install @semantic-release/changelog -d + - npm install @semantic-release/exec -d + - npm install @semantic-release/git -d + - npm install --save conventional-changelog runtime-versions: nodejs: 14 pre_build: From 47671155921e390640a58f4f978b0d7b15f5900a Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 18:40:14 -0700 Subject: [PATCH 14/17] chore: add prod releas and prod validation --- codebuild/release/release-prod.yml | 54 +++----------------------- codebuild/release/release.yml | 47 ++++++++++++++++++++++ codebuild/release/settings.xml | 4 ++ codebuild/release/validate-prod.yml | 3 ++ codebuild/release/validate-staging.yml | 3 ++ look_4_version.sh | 23 +++++++++++ 6 files changed, 85 insertions(+), 49 deletions(-) create mode 100755 look_4_version.sh diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 451a200bf..02c1715bc 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -1,3 +1,6 @@ +## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +## SPDX-License-Identifier: Apache-2.0 + version: 0.2 env: @@ -13,13 +16,7 @@ phases: java: openjdk11 pre_build: commands: - - git checkout $COMMIT_ID - - FOUND_VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - - | - if expr ${FOUND_VERSION} != ${VERSION}; then - echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping" - exit 1; - fi + - VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - 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 ~ @@ -38,45 +35,4 @@ phases: -Dsonatype.password="$SONA_PASSWORD" \ --no-transfer-progress \ -s $SETTINGS_FILE - - -batch: - fast-fail: false - build-graph: - - identifier: release_to_prod - - identifier: validate_prod_release_openjdk8 - depend-on: - - release_to_prod - buildspec: codebuild/release/validate-prod.yml - env: - variables: - JAVA_ENV_VERSION: openjdk8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:3.0 - - identifier: validate_prod_release_openjdk11 - depend-on: - - release_to_prod - buildspec: codebuild/release/validate-prod.yml - env: - variables: - JAVA_ENV_VERSION: openjdk11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:3.0 - - identifier: validate_prod_release_corretto8 - depend-on: - - release_to_prod - buildspec: codebuild/release/validate-prod.yml - env: - variables: - JAVA_ENV_VERSION: corretto8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - - identifier: validate_prod_release_corretto11 - depend-on: - - release_to_prod - buildspec: codebuild/release/validate-prod.yml - env: - variables: - JAVA_ENV_VERSION: corretto11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + - sh look_4_version.sh $VERSION diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index 7c7595a91..3c53df696 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -63,3 +63,50 @@ batch: buildspec: codebuild/release/version.yml env: image: aws/codebuild/standard:5.0 + +# Publish to Maven Central + - identifier: publish + depend-on: + - version + buildspec: codebuild/release/release-prod.yml + +# Validate Maven Central with supported JDK and Corretto + - identifier: validate_prod_release_openjdk_8 + depend-on: + - publish + buildspec: codebuild/release/validate-prod.yml + env: + variables: + JAVA_ENV_VERSION: openjdk8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/standard:3.0 + + - identifier: validate_prod_release_openjdk11 + depend-on: + - publish + buildspec: codebuild/release/validate-prod.yml + env: + variables: + JAVA_ENV_VERSION: openjdk11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/standard:3.0 + + - identifier: validate_prod_release_corretto8 + depend-on: + - publish + buildspec: codebuild/release/validate-prod.yml + env: + variables: + JAVA_ENV_VERSION: corretto8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + + - identifier: validate_prod_release_corretto11 + depend-on: + - publish + buildspec: codebuild/release/validate-prod.yml + env: + variables: + JAVA_ENV_VERSION: corretto11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 diff --git a/codebuild/release/settings.xml b/codebuild/release/settings.xml index 19587de0e..6d32af9bb 100644 --- a/codebuild/release/settings.xml +++ b/codebuild/release/settings.xml @@ -1,3 +1,7 @@ + Date: Thu, 14 Oct 2021 19:08:00 -0700 Subject: [PATCH 15/17] chore: moving version var into the build stage --- codebuild/release/release-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 02c1715bc..1284473d4 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -16,12 +16,12 @@ phases: java: openjdk11 pre_build: commands: - - VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - 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 ~ build: commands: + - VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - | mvn deploy \ -Ppublishing \ From 357051b549518e3d224810a4ff52c6362ebfed60 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Sun, 17 Oct 2021 10:44:55 -0700 Subject: [PATCH 16/17] chore: small updates to script and to release-prod --- codebuild/release/release-prod.yml | 4 ++-- look_4_version.sh | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 1284473d4..9699c27a8 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -16,12 +16,12 @@ phases: java: openjdk11 pre_build: commands: + - export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - 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 ~ build: commands: - - VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - | mvn deploy \ -Ppublishing \ @@ -35,4 +35,4 @@ phases: -Dsonatype.password="$SONA_PASSWORD" \ --no-transfer-progress \ -s $SETTINGS_FILE - - sh look_4_version.sh $VERSION + - ./look_4_version.sh $VERSION diff --git a/look_4_version.sh b/look_4_version.sh index 84fa95ac9..8ee1a5335 100755 --- a/look_4_version.sh +++ b/look_4_version.sh @@ -5,19 +5,25 @@ VERSION=$1 COUNTER=0 - STATUS=1 + +echo "Looking for version $VERSION" + while [ $STATUS -ne 0 ]; do mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.1:get \ - -Dartifact=com.amazonaws:aws-encryption-sdk-java:$VERSION:jar - let STATUS=$? + -Dartifact=com.amazonaws:aws-encryption-sdk-java:$VERSION:jar -U + + STATUS=$? if [ $STATUS -eq 0 ]; then + echo "Found version $VERSION in Maven Central :)" break fi - if [ $((COUNTER+=1)) -eq 10 ]; then + if [ $((COUNTER+=1)) -eq 10 ]; then echo "It has been an awfully long time, you should check Maven Central for issues" exit 1 fi + + echo "Could not find version $VERSION. Trying again." sleep 60 done From 9f67ffe63dd1f4840a5d66348a9f74a97e149e17 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 18 Oct 2021 10:40:51 -0700 Subject: [PATCH 17/17] adding semantic-release command --- codebuild/release/version.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/codebuild/release/version.yml b/codebuild/release/version.yml index 1913ec1c7..5414c11b4 100644 --- a/codebuild/release/version.yml +++ b/codebuild/release/version.yml @@ -24,3 +24,6 @@ phases: - git config --global user.name "aws-crypto-tools-ci-bot" - git config --global user.email "no-reply@noemail.local" - git checkout $BRANCH + build: + commands: + - npx semantic-release --no-ci