Skip to content

Commit 6f3edbd

Browse files
committed
consolidate jobs
Signed-off-by: Jay DeLuca <jaydeluca4@gmail.com>
1 parent 4d5c613 commit 6f3edbd

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

.github/workflows/java-version-matrix-tests.yml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ permissions: {}
1818

1919
jobs:
2020
integration-tests:
21-
name: Integration Tests (Java ${{ matrix.java-version }})
21+
name: Java ${{ matrix.java-version }}
2222
runs-on: ubuntu-24.04
2323
strategy:
2424
fail-fast: false
2525
matrix:
2626
java-version: [8, 11, 17, 21, 25]
27-
test-module:
28-
- it-exporter
29-
- it-pushgateway
3027
steps:
3128
- name: Check out
3229
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -47,25 +44,27 @@ jobs:
4744
restore-keys: |
4845
${{ runner.os }}-maven-
4946
50-
- name: Build project artifacts
51-
run: mise exec -- ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn
47+
- name: Build core library artifacts
48+
run: mise exec -- ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -pl '!integration-tests'
5249

53-
- name: Run integration tests for ${{ matrix.test-module }}
54-
env:
55-
TEST_JAVA_VERSION: ${{ matrix.java-version }}
50+
- name: Build sample apps targeting Java ${{ matrix.java-version }}
5651
run: |
57-
cd integration-tests/${{ matrix.test-module }}
58-
mise exec -- ../../mvnw verify -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn
52+
if [ "${{ matrix.java-version }}" = "8" ]; then
53+
# Java 8 doesn't support --release flag, use source/target instead
54+
mise exec -- ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
55+
-pl integration-tests \
56+
-Dmaven.compiler.source=8 \
57+
-Dmaven.compiler.target=8
58+
else
59+
# Java 9+ supports --release flag for better compatibility
60+
mise exec -- ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
61+
-pl integration-tests \
62+
-Dmaven.compiler.release=${{ matrix.java-version }}
63+
fi
5964
60-
summary:
61-
name: Matrix Test Summary
62-
runs-on: ubuntu-24.04
63-
needs: integration-tests
64-
if: always()
65-
steps:
66-
- name: Check matrix results
65+
- name: Run integration tests in parallel
66+
env:
67+
TEST_JAVA_VERSION: ${{ matrix.java-version }}
6768
run: |
68-
if [ "${{ needs.integration-tests.result }}" == "failure" ]; then
69-
echo "::error::One or more Java version matrix tests failed"
70-
exit 1
71-
fi
69+
cd integration-tests
70+
mise exec -- ../mvnw verify -T 2C -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn

0 commit comments

Comments
 (0)