Skip to content

Commit 55d83c7

Browse files
committed
build improvements
1 parent 2b50fc1 commit 55d83c7

File tree

2 files changed

+30
-12
lines changed

2 files changed

+30
-12
lines changed

.github/workflows/master.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@ on:
77
permissions: # For test summary bot
88
checks: write
99
jobs:
10-
buildAndPublish:
10+
buildAndTest:
1111
runs-on: ubuntu-latest
12-
env:
13-
MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
14-
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
15-
MAVEN_CENTRAL_USER_NEW: ${{ secrets.MAVEN_CENTRAL_USER_NEW }}
16-
MAVEN_CENTRAL_PASSWORD_NEW: ${{ secrets.MAVEN_CENTRAL_PASSWORD_NEW }}
17-
MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
18-
12+
strategy:
13+
matrix:
14+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
1915
steps:
2016
- uses: actions/checkout@v5
2117
- uses: gradle/actions/wrapper-validation@v5
@@ -24,8 +20,8 @@ jobs:
2420
with:
2521
java-version: '21'
2622
distribution: 'corretto'
27-
- name: build test and publish
28-
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
23+
- name: build and test
24+
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
2925
- name: Publish Test Results
3026
uses: EnricoMi/publish-unit-test-result-action@v2.20.0
3127
if: always()
@@ -34,3 +30,23 @@ jobs:
3430
**/build/test-results/test/TEST-*.xml
3531
**/build/test-results/testWithJava11/TEST-*.xml
3632
**/build/test-results/testWithJava17/TEST-*.xml
33+
publishToMavenCentral:
34+
needs: buildAndTest
35+
runs-on: ubuntu-latest
36+
env:
37+
MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
38+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
39+
MAVEN_CENTRAL_USER_NEW: ${{ secrets.MAVEN_CENTRAL_USER_NEW }}
40+
MAVEN_CENTRAL_PASSWORD_NEW: ${{ secrets.MAVEN_CENTRAL_PASSWORD_NEW }}
41+
MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
42+
43+
steps:
44+
- uses: actions/checkout@v5
45+
- uses: gradle/actions/wrapper-validation@v5
46+
- name: Set up JDK 21
47+
uses: actions/setup-java@v5
48+
with:
49+
java-version: '21'
50+
distribution: 'corretto'
51+
- name: publishToMavenCentral
52+
run: ./gradlew assemble && ./gradlew check -x test -x testng --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

.github/workflows/pull_request.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ jobs:
3535
uses: EnricoMi/publish-unit-test-result-action@v2.20.0
3636
if: always()
3737
with:
38-
files: '**/build/test-results/test/TEST-*.xml'
39-
38+
files: |
39+
**/build/test-results/test/TEST-*.xml
40+
**/build/test-results/testWithJava11/TEST-*.xml
41+
**/build/test-results/testWithJava17/TEST-*.xml

0 commit comments

Comments
 (0)