Merge branch 'master' into locale-fix

aws · Dec 5, 2023 · 4f4000d · 4f4000d
2 parents 8e41011 + 1870a08
commit 4f4000d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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_EVENT_NAME
+        env:
+          GITHUB_EVENT_NAME: $GITHUB_EVENT_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_EVENT_NAME
         env:
           JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
           JAVA_NUMERIC_VERSION: ${{ matrix.version }}
+          GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME
diff --git 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-$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
@@ -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-$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

diff --git a/codebuild/release/javadoc.yml b/codebuild/release/javadoc.yml
@@ -23,4 +23,4 @@ phases:
       - cp -r /tmp/apidocs/* .
       - git add .
       - 'git commit -m "docs: updating javadocs"'
-      - git push
+      - git push -u origin $GH_PAGES