Skip to content

Commit 41bc52f

Browse files
committed
Add matrix.jdk to unit tests(main) and remove all-jdk step
We will likely need to parallelize the runs
1 parent dd27302 commit 41bc52f

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
uses: ./.github/workflows/worker.yml
2929
with:
3030
script: .github/scripts/run_unit-tests -Dtest=!QTest,'${{ matrix.pattern }}' -Dmaven.test.failure.ignore=true
31-
jdk: 17
3231
artifact_prefix: "unit-test-reports"
33-
key: "test-jdk17-[${{ matrix.pattern }}]"
32+
jdk: [ "17", "21" ]
33+
key: "test-jdk${{ matrix.jdk }}-[${{ matrix.pattern }}]"
3434

3535
validate-dist:
3636
uses: ./.github/workflows/worker.yml
@@ -71,21 +71,6 @@ jobs:
7171
artifacts_to_download: "unit-test-reports-*"
7272
key: "coverage-jacoco"
7373

74-
run-unit-tests-all-jdk:
75-
needs: test-report
76-
name: "unit tests(all jdk)"
77-
if: ${{ !cancelled() && ( contains( github.event.pull_request.labels.*.name, 'tests:all-jdk') || github.event_name == 'push' ) }}
78-
strategy:
79-
fail-fast: false
80-
matrix:
81-
jdk: [ "21" ]
82-
pattern: [ "C*", "H*,U*,V*", "N*,Q*,S*", "B*,O*,R*", "G*,J*,K*", "F*,L*,M*", "A*,D*,I*,X*,Y*,Z*", "E*,P*,T*,W*"]
83-
uses: ./.github/workflows/worker.yml
84-
with:
85-
script: .github/scripts/run_unit-tests -Dtest=!QTest,'${{ matrix.pattern }}' -fae
86-
jdk: ${{ matrix.jdk }}
87-
key: "test-jdk${{ matrix.jdk }}-[${{ matrix.pattern }}]"
88-
8974
# this will be running in parallel with the ITs later; but until that migration happens - run them in parallel with normal tests
9075
run-qtest:
9176
strategy:

0 commit comments

Comments
 (0)