Skip to content

Commit dde7484

Browse files
committed
extend wf
1 parent 5fee4e1 commit dde7484

1 file changed

Lines changed: 20 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,20 @@ name: "CI"
1717

1818
on:
1919
workflow_call:
20-
inputs:
21-
jdk:
22-
required: false
23-
type: string
24-
default: '17'
2520

2621
jobs:
2722
run-unit-tests:
2823
name: "unit tests"
2924
strategy:
3025
fail-fast: false
3126
matrix:
32-
Dtest: [ "A*,F*,S*", "B*,D*,L*,T*", "C*,O*", "E*,N*,Q*", "G*,R*,U*", "H*,I*,J*", "K*,P*,V*,W*,X*,Y*,Z*", "M*"]
27+
pattern: [ "A*,F*,S*", "B*,D*,L*,T*", "C*,O*", "E*,N*,Q*", "G*,R*,U*", "H*,I*,J*", "K*,P*,V*,W*,X*,Y*,Z*", "M*"]
3328
uses: ./.github/workflows/worker.yml
3429
with:
35-
script: .github/scripts/run-unit-tests.sh -Dtest='${{ matrix.Dtest }}' -Dmaven.test.failure.ignore=true
36-
jdk: ${{ inputs.jdk }}
30+
script: .github/scripts/run-unit-tests.sh -Dtest='${{ matrix.pattern }}' -Dmaven.test.failure.ignore=true
31+
jdk: 17
3732
artifact_prefix: "unit-test-reports"
38-
key: ${{ matrix.Dtest }}
33+
key: ${{ matrix.pattern }}
3934

4035
reporting-unit-test-failures:
4136
name: "report-unit-test-failures"
@@ -64,8 +59,23 @@ jobs:
6459
name: "report-jacoco-coverage-failures"
6560
needs: run-unit-tests
6661
uses: ./.github/workflows/worker.yml
67-
if: ${{ !contains( github.event.pull_request.labels.*.name, 'jacoco:skip') }}
62+
if: !cancelled() && !contains( github.event.pull_request.labels.*.name, 'jacoco:skip')
6863
with:
6964
script: .github/scripts/create-jacoco-coverage-report.sh
7065
artifacts_to_download: "unit-test-reports-*"
7166
key: "jacoco-coverage-report"
67+
68+
run-unit-tests:
69+
needs: reporting-unit-test-failures
70+
name: "unit tests"
71+
if: !cancelled() && ( contains( github.event.pull_request.labels.*.name, 'tests:all-jdk') || github.event_name == 'push' )
72+
strategy:
73+
matrix:
74+
pattern: [ "A*,F*,S*", "B*,D*,L*,T*", "C*,O*", "E*,N*,Q*", "G*,R*,U*", "H*,I*,J*", "K*,P*,V*,W*,X*,Y*,Z*", "M*"]
75+
jdk: [ "17", "21.0.4" ]
76+
uses: ./.github/workflows/worker.yml
77+
with:
78+
script: .github/scripts/run-unit-tests.sh -Dtest='${{ matrix.pattern }}' -fae
79+
jdk: ${{ matrix.jdk }}
80+
artifact_prefix: "unit-test-reports"
81+
key: ${{ matrix.pattern }}

0 commit comments

Comments
 (0)