Skip to content

Commit

Permalink
Merge pull request quarkusio#37812 from gsmet/fix-java-name
Browse files Browse the repository at this point in the history
Fix name in Dev Tools matrix
  • Loading branch information
gsmet authored Dec 18, 2023
2 parents cdbfbc6 + 12ed3cd commit d190632
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/matrix-jvm-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"name": "17 Windows",
"java-version": 17,
"maven_args": "-DskipDocs -Dformat.skip",
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g -Xlog:gc*=debug:file=windows-java-17.txt",
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
"os-name": "windows-latest"
}]
44 changes: 18 additions & 26 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ jobs:
target/build-report.json
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

calculate-test-jobs:
name: Calculate Test Jobs
Expand Down Expand Up @@ -380,7 +380,7 @@ jobs:
with:
name: test-reports-jvm${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 5
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
Expand All @@ -391,23 +391,15 @@ jobs:
target/build-report.json
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Upload gc.log
uses: actions/upload-artifact@v3
with:
name: "GC log - JDK ${{matrix.java.name}}"
path: |
**/windows-java-17.txt
!**/build/tmp/**
retention-days: 5
retention-days: 7
- name: Upload build.log (if build failed)
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
with:
name: "build-logs-JVM Tests - JDK ${{matrix.java.name}}"
path: |
**/build.log
retention-days: 2
retention-days: 7

maven-tests:
name: Maven Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -485,7 +477,7 @@ jobs:
with:
name: test-reports-maven-java${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 5
retention-days: 7
# see https://github.com/actions/toolkit/blob/master/packages/artifact/docs/additional-information.md#non-supported-characters
- name: Rename invalid path
if: ${{ failure() || cancelled() }}
Expand All @@ -503,7 +495,7 @@ jobs:
target/build-report.json
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

gradle-tests:
name: Gradle Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -583,7 +575,7 @@ jobs:
target/build-report.json
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

devtools-tests:
name: Devtools Tests - JDK ${{matrix.java.name}}
Expand All @@ -597,7 +589,7 @@ jobs:
matrix:
java:
- {
name: "7",
name: "17",
java-version: 17,
os-name: "ubuntu-latest"
}
Expand Down Expand Up @@ -658,7 +650,7 @@ jobs:
with:
name: test-reports-devtools-java${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 5
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
Expand All @@ -669,7 +661,7 @@ jobs:
target/build-report.json
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

kubernetes-tests:
name: Kubernetes Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -744,7 +736,7 @@ jobs:
with:
name: test-reports-kubernetes-java${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 5
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
Expand All @@ -755,7 +747,7 @@ jobs:
target/build-report.json
**/target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

quickstarts-tests:
name: Quickstarts Compilation - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -819,7 +811,7 @@ jobs:
quarkus-quickstarts/**/target/*-reports/TEST-*.xml
quarkus-quickstarts/target/build-report.json
quarkus-quickstarts/LICENSE
retention-days: 2
retention-days: 7

virtual-thread-native-tests:
name: Native Tests - Virtual Thread - ${{matrix.category}}
Expand Down Expand Up @@ -885,7 +877,7 @@ jobs:
integration-tests/virtual-threads/**/target/*-reports/TEST-*.xml
integration-tests/virtual-threads/target/build-report.json
integration-tests/virtual-threads/target/gradle-build-scan-url.txt
retention-days: 2
retention-days: 7

tcks-test:
name: MicroProfile TCKs Tests
Expand Down Expand Up @@ -949,7 +941,7 @@ jobs:
with:
name: test-reports-tcks
path: 'test-reports.tgz'
retention-days: 5
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
Expand All @@ -960,7 +952,7 @@ jobs:
target/build-report.json
**/target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

native-tests:
name: Native Tests - ${{matrix.category}}
Expand Down Expand Up @@ -1047,7 +1039,7 @@ jobs:
with:
name: test-reports-native-${{matrix.category}}
path: 'test-reports.tgz'
retention-days: 5
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
Expand All @@ -1059,7 +1051,7 @@ jobs:
target/build-report.json
**/target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
retention-days: 7

build-report:
runs-on: ubuntu-latest
Expand Down

0 comments on commit d190632

Please sign in to comment.