From 39afca0924ca2efa3b77e179435c819d4a3ae8d0 Mon Sep 17 00:00:00 2001 From: Darwin Chowdary Date: Mon, 4 Dec 2023 01:19:07 -0800 Subject: [PATCH 1/4] chore: fix release-ci --- codebuild/ci/release-ci.yml | 2 +- codebuild/ci/validate-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index 76d85e390..72e3af2de 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -26,7 +26,7 @@ phases: - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$CODEBUILD_WEBHOOK_TRIGGER" # Remove any old artifacts with the same commit ID. This allows CI to run more than once for the same commit - | diff --git a/codebuild/ci/validate-ci.yml b/codebuild/ci/validate-ci.yml index 711e5048a..dc721157a 100644 --- a/codebuild/ci/validate-ci.yml +++ b/codebuild/ci/validate-ci.yml @@ -16,7 +16,7 @@ phases: java: $JAVA_ENV_VERSION pre_build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$CODEBUILD_WEBHOOK_TRIGGER" - export SETTINGS_FILE=$(pwd)/codebuild/ci/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 b56984827b46594e0961b4666ce17b67a7e7273e Mon Sep 17 00:00:00 2001 From: Darwin Chowdary Date: Mon, 4 Dec 2023 01:26:29 -0800 Subject: [PATCH 2/4] chore: fix release-ci --- codebuild/ci/release-ci.yml | 2 +- codebuild/ci/validate-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index 72e3af2de..bf36b1cf6 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -26,7 +26,7 @@ phases: - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$CODEBUILD_WEBHOOK_TRIGGER" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-${CODEBUILD_WEBHOOK_TRIGGER}" # Remove any old artifacts with the same commit ID. This allows CI to run more than once for the same commit - | diff --git a/codebuild/ci/validate-ci.yml b/codebuild/ci/validate-ci.yml index dc721157a..11e366bd3 100644 --- a/codebuild/ci/validate-ci.yml +++ b/codebuild/ci/validate-ci.yml @@ -16,7 +16,7 @@ phases: java: $JAVA_ENV_VERSION pre_build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$CODEBUILD_WEBHOOK_TRIGGER" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-${CODEBUILD_WEBHOOK_TRIGGER}" - export SETTINGS_FILE=$(pwd)/codebuild/ci/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 17a8ab44c574aa42e83d042ffab336aa46cdc766 Mon Sep 17 00:00:00 2001 From: Darwin Chowdary Date: Mon, 4 Dec 2023 10:10:38 -0800 Subject: [PATCH 3/4] chore: fix release-ci --- .github/workflows/ci.yml | 7 ++++++- codebuild/ci/release-ci.yml | 2 +- codebuild/ci/validate-ci.yml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85fcb3d78..246f8226e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,6 +76,9 @@ jobs: buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE image-override: aws/codebuild/standard:3.0 + env-vars-for-codebuild: GITHUB_REF_NAME + env: + GITHUB_REF_NAME: $GITHUB_REF_NAME validateCI: name: Validate CI runs-on: ubuntu-latest @@ -106,7 +109,9 @@ jobs: image-override: ${{ matrix.platform.image }} env-vars-for-codebuild: | JAVA_ENV_VERSION, - JAVA_NUMERIC_VERSION + JAVA_NUMERIC_VERSION, + GITHUB_REF_NAME env: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} JAVA_NUMERIC_VERSION: ${{ matrix.version }} + GITHUB_REF_NAME: $GITHUB_REF_NAME diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index bf36b1cf6..0bd59d88b 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -26,7 +26,7 @@ phases: - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-${CODEBUILD_WEBHOOK_TRIGGER}" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$GITHUB_REF_NAME" # Remove any old artifacts with the same commit ID. This allows CI to run more than once for the same commit - | diff --git a/codebuild/ci/validate-ci.yml b/codebuild/ci/validate-ci.yml index 11e366bd3..227683653 100644 --- a/codebuild/ci/validate-ci.yml +++ b/codebuild/ci/validate-ci.yml @@ -16,7 +16,7 @@ phases: java: $JAVA_ENV_VERSION pre_build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-${CODEBUILD_WEBHOOK_TRIGGER}" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$GITHUB_REF_NAME" - export SETTINGS_FILE=$(pwd)/codebuild/ci/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 c2395e3c0057effdd41cf23194e4c7da1e99a2cf Mon Sep 17 00:00:00 2001 From: Darwin Chowdary Date: Mon, 4 Dec 2023 10:22:57 -0800 Subject: [PATCH 4/4] chore: fix release-ci --- .github/workflows/ci.yml | 8 ++++---- codebuild/ci/release-ci.yml | 2 +- codebuild/ci/validate-ci.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 246f8226e..98a79a5dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,9 +76,9 @@ jobs: buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE image-override: aws/codebuild/standard:3.0 - env-vars-for-codebuild: GITHUB_REF_NAME + env-vars-for-codebuild: GITHUB_EVENT_NAME env: - GITHUB_REF_NAME: $GITHUB_REF_NAME + GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME validateCI: name: Validate CI runs-on: ubuntu-latest @@ -110,8 +110,8 @@ jobs: env-vars-for-codebuild: | JAVA_ENV_VERSION, JAVA_NUMERIC_VERSION, - GITHUB_REF_NAME + GITHUB_EVENT_NAME env: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} JAVA_NUMERIC_VERSION: ${{ matrix.version }} - GITHUB_REF_NAME: $GITHUB_REF_NAME + GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index 0bd59d88b..1f799295d 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -26,7 +26,7 @@ phases: - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$GITHUB_REF_NAME" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$GITHUB_EVENT_NAME" # Remove any old artifacts with the same commit ID. This allows CI to run more than once for the same commit - | diff --git a/codebuild/ci/validate-ci.yml b/codebuild/ci/validate-ci.yml index 227683653..dc01d96e0 100644 --- a/codebuild/ci/validate-ci.yml +++ b/codebuild/ci/validate-ci.yml @@ -16,7 +16,7 @@ phases: java: $JAVA_ENV_VERSION pre_build: commands: - - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$GITHUB_REF_NAME" + - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION-$GITHUB_EVENT_NAME" - export SETTINGS_FILE=$(pwd)/codebuild/ci/settings.xml - git clone https://github.com/aws-samples/busy-engineers-document-bucket.git - cd busy-engineers-document-bucket/exercises/java/encryption-context-complete