Skip to content

Commit 56ea4b9

Browse files
authored
Merge branch 'main' into feature/support-parallelization-in-junit-vintage-engine
2 parents 96b31e0 + 5f1159d commit 56ea4b9

File tree

248 files changed

+4299
-1537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+4299
-1537
lines changed

.github/actions/main-build/action.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
arguments:
55
required: true
66
description: Gradle arguments
7-
default: :platform-tooling-support-tests:test build --configuration-cache
7+
default: :platform-tooling-support-tests:test build --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
88
encryptionKey:
99
required: true
1010
description: Gradle cache encryption key
@@ -16,3 +16,8 @@ runs:
1616
with:
1717
arguments: ${{ inputs.arguments }}
1818
encryptionKey: ${{ inputs.encryptionKey }}
19+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
20+
if: ${{ always() }}
21+
with:
22+
name: Open Test Reports (${{ github.job }})
23+
path: '**/build/reports/open-test-report.html'

.github/actions/run-gradle/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
distribution: temurin
1818
java-version: 21
1919
check-latest: true
20-
- uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
20+
- uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
2121
with:
2222
cache-encryption-key: ${{ inputs.encryptionKey }}
2323
- shell: bash

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Check out repository
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3
37+
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3
3838
with:
3939
languages: ${{ matrix.language }}
4040
tools: linked
@@ -47,4 +47,4 @@ jobs:
4747
-Dscan.tag.CodeQL \
4848
allMainClasses
4949
- name: Perform CodeQL Analysis
50-
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3
50+
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3

.github/workflows/cross-version.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,16 @@ jobs:
6262
with:
6363
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
6464
arguments: |
65+
-Ptesting.enableJaCoCo=false \
6566
-PjavaToolchain.version=${{ matrix.jdk.version }} \
6667
-Dscan.tag.JDK_${{ matrix.jdk.version }} \
6768
build \
68-
--configuration-cache
69+
--no-configuration-cache #Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
70+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
71+
if: ${{ always() }}
72+
with:
73+
name: Open Test Reports (${{ github.job }} ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }}))
74+
path: '**/build/reports/open-test-report.html'
6975
openj9:
7076
strategy:
7177
fail-fast: false
@@ -96,9 +102,15 @@ jobs:
96102
with:
97103
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
98104
arguments: |
105+
-Ptesting.enableJaCoCo=false \
99106
-PjavaToolchain.version=${{ matrix.jdk }} \
100107
-PjavaToolchain.implementation=j9 \
101108
-Dscan.tag.JDK_${{ matrix.jdk }} \
102109
-Dscan.tag.OpenJ9 \
103110
build \
104-
--configuration-cache
111+
--no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
112+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
113+
if: ${{ always() }}
114+
with:
115+
name: Open Test Reports (${{ github.job }})
116+
path: '**/build/reports/open-test-report.html'

.github/workflows/gradle-dependency-submission.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
java-version: 21
2626
check-latest: true
2727
- name: Generate and submit dependency graph
28-
uses: gradle/actions/dependency-submission@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
28+
uses: gradle/actions/dependency-submission@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
fetch-depth: 1
2525
- name: Install GraalVM
26-
uses: graalvm/setup-graalvm@3aaf71e276c9159bbdfbcdab8abc50c95f41a2c8 # v1
26+
uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1
2727
with:
2828
distribution: graalvm-community
2929
version: 'latest'
@@ -34,13 +34,12 @@ jobs:
3434
with:
3535
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3636
arguments: |
37-
-Ptesting.enableJaCoCo \
3837
:platform-tooling-support-tests:test \
3938
build \
4039
jacocoRootReport \
41-
--configuration-cache
40+
--no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
4241
- name: Upload to Codecov.io
43-
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
42+
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5
4443
with:
4544
token: ${{ secrets.CODECOV_TOKEN }}
4645

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
# Upload the results to GitHub's code scanning dashboard (optional).
5858
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3
60+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3
6161
with:
6262
sarif_file: results.sarif

.github/workflows/reproducible-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3030
arguments: |
3131
--quiet \
32-
--configuration-cache
32+
--no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
3333
- name: Build and compare checksums
3434
shell: bash
3535
run: |

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Gradle
22
.gradle
3+
.kotlin
34
build
45

56
# Ignore Gradle GUI config
@@ -30,5 +31,6 @@ gradle-app.setting
3031
coverage.db*
3132
.metadata
3233
/.sdkmanrc
34+
/.tool-versions
3335

3436
checksums*

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ builds of the next OpenJDK.
4949
Code coverage using [JaCoCo] for the latest build is available on [Codecov].
5050

5151
A code coverage report can also be generated locally via the [Gradle Wrapper] by
52-
executing `./gradlew -Ptesting.enableJaCoCo clean jacocoRootReport`. The results will be available
52+
executing `./gradlew clean jacocoRootReport`. The results will be available
5353
in `build/reports/jacoco/jacocoRootReport/html/index.html`.
5454

5555
## Develocity

0 commit comments

Comments
 (0)