Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ jobs:
project-name: AWS-ESDK-Java-CI
buildspec-override: codebuild/ci/static-analysis.yml
compute-type-override: BUILD_GENERAL1_MEDIUM
image-override: aws/codebuild/amazonlinux2-x86_64-standard:3.0
image-override: "aws/codebuild/amazonlinux-x86_64-standard:5.0"
vectorTests:
name: Vector Tests
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
# - distribution: openjdk
# image: "aws/codebuild/amazonlinux-x86_64-standard:5.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -65,10 +65,10 @@ jobs:
fail-fast: true
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
# - distribution: openjdk
# image: "aws/codebuild/standard:3.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -95,10 +95,10 @@ jobs:
fail-fast: true
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
# - distribution: openjdk
# image: "aws/codebuild/standard:3.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand Down Expand Up @@ -126,10 +126,10 @@ jobs:
fail-fast: true
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
# - distribution: openjdk
# image: "aws/codebuild/standard:3.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
project-name: AWS-ESDK-Java-CI
buildspec-override: codebuild/ci/release-ci.yml
compute-type-override: BUILD_GENERAL1_LARGE
image-override: aws/codebuild/standard:3.0
image-override: "aws/codebuild/amazonlinux-x86_64-standard:5.0"
env-vars-for-codebuild: GITHUB_EVENT_NAME
env:
GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME
Expand All @@ -178,10 +178,10 @@ jobs:
fail-fast: true
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
# - distribution: openjdk
# image: "aws/codebuild/standard:3.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand Down
2 changes: 1 addition & 1 deletion codebuild/ci/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
phases:
install:
runtime-versions:
java: openjdk11
java: corretto11
commands:
- git submodule update --init submodules/MaterialProviders
# Get Dafny
Expand Down
94 changes: 47 additions & 47 deletions codebuild/release/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ batch:
buildspec: codebuild/release/release-staging.yml

# Validate CodeArtifact with supported JDK and Corretto
- identifier: validate_staging_release_openjdk8
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_openjdk8
# 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:
Expand All @@ -40,7 +40,7 @@ batch:
variables:
JAVA_ENV_VERSION: corretto8
JAVA_NUMERIC_VERSION: 8
image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0"

- identifier: validate_staging_release_corretto11
depend-on:
Expand All @@ -50,14 +50,14 @@ batch:
variables:
JAVA_ENV_VERSION: corretto11
JAVA_NUMERIC_VERSION: 11
image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0"

# Version Project
- identifier: version
depend-on:
- release_staging
- validate_staging_release_openjdk8
- validate_staging_release_openjdk11
# - validate_staging_release_openjdk8
# - validate_staging_release_openjdk11
- validate_staging_release_corretto8
- validate_staging_release_corretto11
buildspec: codebuild/release/version.yml
Expand All @@ -77,25 +77,25 @@ batch:
buildspec: codebuild/release/artifact-hunt.yml

# Validate Maven Central with supported JDK and Corretto
- identifier: validate_prod_release_openjdk8
depend-on:
- artifact_hunt
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:
- artifact_hunt
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_openjdk8
# depend-on:
# - artifact_hunt
# 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:
# - artifact_hunt
# 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:
Expand All @@ -105,7 +105,7 @@ batch:
variables:
JAVA_ENV_VERSION: corretto8
JAVA_NUMERIC_VERSION: 8
image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0"

- identifier: validate_prod_release_corretto11
depend-on:
Expand All @@ -115,13 +115,13 @@ batch:
variables:
JAVA_ENV_VERSION: corretto11
JAVA_NUMERIC_VERSION: 11
image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0"

# Upload Artifacts
- identifier: upload_artifacts
depend-on:
- validate_prod_release_openjdk8
- validate_prod_release_openjdk11
# - validate_prod_release_openjdk8
# - validate_prod_release_openjdk11
- validate_prod_release_corretto8
- validate_prod_release_corretto11
buildspec: codebuild/release/upload_artifacts.yml
Expand All @@ -139,4 +139,4 @@ batch:
variables:
JAVA_ENV_VERSION: coretto11
JAVA_NUMERIC_VERSION: 11
image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
image: "aws/codebuild/amazonlinux-x86_64-standard:5.0"