m

Author: ajewellamz

.github/workflows/ci.yml

@@ -36,8 +36,10 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
+            runtime: corretto
             image: "aws/codebuild/standard:7.0"
           - distribution: corretto
+            runtime: corretto
             image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
@@ -57,7 +59,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   vectorTestsMasterKeyProvider:
     name: Vector Tests MasterKeyProvider
     runs-on: ubuntu-latest
@@ -66,8 +68,10 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
+            runtime: corretto
             image: "aws/codebuild/standard:7.0"
           - distribution: corretto
+            runtime: corretto
             image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
@@ -87,7 +91,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   netVectorTests:
     name: ESDK-NET Vector Tests
     runs-on: ubuntu-latest
@@ -96,8 +100,10 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
+            runtime: corretto
             image: "aws/codebuild/standard:7.0"
           - distribution: corretto
+            runtime: corretto
             image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
@@ -117,7 +123,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   generateTestVectors:
     name: Generate Vectors
     runs-on: ubuntu-latest
@@ -127,8 +133,10 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
+            runtime: corretto
             image: "aws/codebuild/standard:7.0"
           - distribution: corretto
+            runtime: corretto
             image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
@@ -148,7 +156,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   releaseCI:
     name: Release CI
     runs-on: ubuntu-latest
@@ -179,8 +187,10 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
+            runtime: corretto
             image: "aws/codebuild/standard:7.0"
           - distribution: corretto
+            runtime: corretto
             image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
@@ -203,6 +213,6 @@ jobs:
             JAVA_NUMERIC_VERSION,
             GITHUB_EVENT_NAME
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
           JAVA_NUMERIC_VERSION: ${{ matrix.version }}
           GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME