Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix release-ci #1883

Merged
merged 4 commits into from
Dec 4, 2023
Merged

chore: fix release-ci #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39afca0
chore: fix release-ci
imabhichow Dec 4, 2023
b569848
chore: fix release-ci
imabhichow Dec 4, 2023
17a8ab4
chore: fix release-ci
imabhichow Dec 4, 2023
c2395e3
chore: fix release-ci
imabhichow Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion codebuild/ci/release-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
- |
Expand Down
2 changes: 1 addition & 1 deletion codebuild/ci/validate-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down