Merge branch 'main' into jocorell/update-required-ci

aws · Jan 17, 2025 · a19fe3f · a19fe3f
2 parents cde1e7d + 1e73c92
commit a19fe3f
Showing 1 changed file with 11 additions and 83 deletions.
diff --git a/.github/workflows/library_java_tests.yml b/.github/workflows/library_java_tests.yml
@@ -19,13 +19,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        library:
-          [
+        library: [
             AwsCryptographyPrimitives,
             ComAmazonawsKms,
             ComAmazonawsDynamodb,
             AwsCryptographicMaterialProviders,
-            TestVectorsAwsCryptographicMaterialProviders,
+            # TestVectorsAwsCryptographicMaterialProviders,
             StandardLibrary,
           ]
         os: [
@@ -34,6 +33,7 @@ jobs:
             ubuntu-22.04,
             macos-13,
           ]
+        java-versions: [8, 11, 16, 17]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -73,17 +73,17 @@ jobs:
           library: ${{ matrix.library }}
           diff-generated-code: false
 
-      - name: Copy over keys.json so that it is discoverable by the tests
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: copyKeysJSON
-          build-root-directory: ./TestVectorsAwsCryptographicMaterialProviders/runtimes/java
+      # - name: Copy over keys.json so that it is discoverable by the tests
+      #   uses: gradle/gradle-build-action@v2
+      #   with:
+      #     arguments: copyKeysJSON
+      #     build-root-directory: ./TestVectorsAwsCryptographicMaterialProviders/runtimes/java
 
-      - name: Setup Java 8
+      - name: Setup Java ${{matrix.java-versions}}
         uses: actions/setup-java@v3
         with:
           distribution: "corretto"
-          java-version: 8
+          java-version: ${{matrix.java-versions}}
 
       - name: Build ${{ matrix.library }} implementation
         working-directory: ./${{ matrix.library }}
@@ -92,79 +92,7 @@ jobs:
           CORES=$(node -e 'console.log(os.cpus().length)')
           make build_java CORES=$CORES
 
-      - name: Test ${{ matrix.library }}
+      - name: Test ${{ matrix.library }} on ${{matrix.java-versions}}
         working-directory: ./${{ matrix.library }}
         run: |
           make test_java
-
-      - name: Setup Java 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: "corretto"
-          java-version: 11
-
-      - name: Clean for next Java
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: clean
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Compile Java 11
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: build
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Test Java 11
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: runTests
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Setup Java 16
-        uses: actions/setup-java@v3
-        with:
-          distribution: "corretto"
-          java-version: 16
-
-      - name: Clean for next Java
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: clean
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Compile Java 16
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: build
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Test Java 16
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: runTests
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Setup Java 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: "corretto"
-          java-version: 17
-
-      - name: Clean for next Java
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: clean
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Compile Java 17
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: build
-          build-root-directory: ./${{ matrix.library }}/runtimes/java
-
-      - name: Test Java 17
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: runTests
-          build-root-directory: ./${{ matrix.library }}/runtimes/java