Simplify ci-pr.yml running of samples

See #300

Signed-off-by: onobc <[email protected]>

Author: onobc

.github/workflows/ci-pr.yml

@@ -12,55 +12,29 @@ jobs:
   build_and_verify:
     name: Build and Verify
     if: ${{ github.repository == 'spring-projects/spring-grpc' }}
+    strategy:
+      matrix:
+        include:
+          - javaVersion: 25
+            distribution: 'liberica'
+          - javaVersion: 17
+            distribution: 'temurin'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 25
+      - name: Set up Java ${{ matrix.javaVersion }} ${{ matrix.distribution }}
         uses: actions/setup-java@v4
         with:
-          java-version: '25'
-          distribution: 'liberica'
+          java-version: ${{ matrix.javaVersion }}
+          distribution: ${{ matrix.distribution }}
           cache: maven
-      - name: Build, test, and run samples using Java 25 w/ target=17
+      - name: Build, test, and run samples (Java ${{ matrix.javaVersion }} ${{ matrix.distribution }})
         run: |
           ./mvnw -B clean install
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
-      - name: Run samples built w/ Java 25 w/ target=17 using Java 17
-        run: |
-          pushd samples > /dev/null
-          ../mvnw test \
-              -Dmaven-checkstyle-plugin.config.location=../src/checkstyle
-          popd > /dev/null
-
-      - name: Set up JDK 25
-        uses: actions/setup-java@v4
-        with:
-          java-version: '25'
-          distribution: 'liberica'
-          cache: maven
-      - name: Build and run samples using Java 25 w/ target=25
-        run: |
-          pushd samples > /dev/null
-          ../mvnw clean install \
-              -pl '!grpc-server-kotlin' \
-              -Dmaven-checkstyle-plugin.config.location=../src/checkstyle \
-              -Djava.version=25
-          ../mvnw clean install \
-              -pl 'grpc-server-kotlin' \
-              -Dmaven-checkstyle-plugin.config.location=../src/checkstyle \
-              -Djava.version=24
-          popd > /dev/null
-
-      - name: Capture Test Results
+      - name: Upload Build Reports (Java ${{ matrix.javaVersion }} ${{ matrix.distribution }})
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-java-${{ matrix.javaVersion }}-${{ matrix.distribution }}
           path: '*/target/surefire-reports/*.*'
           retention-days: 3