1 files changed, 81 insertions, 16 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89e1bfc..8b7ca52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,18 +7,92 @@ on:
     branches: [ "master" ]
 
 jobs:
-  build:
-
+  applet:
     runs-on: ubuntu-latest
     permissions:
       contents: read
 
     strategy:
       matrix:
-        java: [ "8", "11", "17", "21" ]
+        java: [ "8", "11", "17"]
     env:
       JAVA_VERSION: ${{ matrix.java }}
-    name: Build Java ${{ matrix.java }}
+    name: Build applet with Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Build applets
+        run: ./gradlew applet:buildJavaCard
+
+      - name: Test
+        run: ./gradlew applet:test
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: built-applet-${{ matrix.java }}
+          path: |
+            applet/build/javacard/*.cap
+
+  reader:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    strategy:
+      matrix:
+        java: [ "11", "17", "21" ]
+    name: Build reader on Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Build reader
+        run: ./gradlew reader:uberJar
+
+      - name: Test
+        run: ./gradlew reader:test
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: built-reader-${{ matrix.java }}
+          path: |
+            reader/build/libs/ECTesterReader.jar
+
+  standalone:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    strategy:
+      matrix:
+        java: [ "11", "17", "21" ]
+    env:
+      # ffs: https://github.com/adoptium/adoptium-support/issues/485 !!!
+      LD_LIBRARY_PATH: "/usr/lib/x86_64-linux-gnu/"
+    name: Build standalone on Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -41,12 +115,6 @@ jobs:
           echo "LIBRESSL_VERSION=$(git submodule status ext/libressl | cut -f2 -d' ')" >> $GITHUB_ENV
           echo "IPPCP_VERSION=$(git submodule status ext/ipp-crypto | cut -f2 -d' ')" >> $GITHUB_ENV
 
-      - name: Build applets
-        run: if [ $JAVA_VERSION != 21 ]; then ./gradlew applet:buildJavaCard; fi
-
-      - name: Build reader
-        run: ./gradlew reader:uberJar
-
       - name: Cache libs
         uses: actions/cache@v4
         id: cache-libs
@@ -82,20 +150,17 @@ jobs:
           ./gradlew standalone:libs || true
           ./gradlew standalone:uberJar
 
-      # ffs: https://github.com/adoptium/adoptium-support/issues/485 !!!
       - name: List libraries
-        run: env LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu/" ./gradlew standalone:run --args="list-libs"
+        run: ./gradlew standalone:run --args="list-libs"
 
       - name: Test
-        run: ./gradlew test
+        run: ./gradlew standalone:test
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: built-${{ matrix.java }}
+          name: built-standalone-${{ matrix.java }}
           path: |
-            applet/build/javacard/*.cap
-            reader/build/libs/ECTesterReader.jar
             standalone/build/libs/ECTesterStandalone.jar
 
       - name: Upload code coverage