Skip to content

Commit

Permalink
Merge branch 'junit-team:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
XJ114514 authored Sep 13, 2024
2 parents 50552b4 + eb5b398 commit e8d11bd
Show file tree
Hide file tree
Showing 66 changed files with 355 additions and 212 deletions.
2 changes: 1 addition & 1 deletion .github/actions/main-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
arguments:
required: true
description: Gradle arguments
default: :platform-tooling-support-tests:test build
default: :platform-tooling-support-tests:test build --configuration-cache
runs:
using: "composite"
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/run-gradle/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ inputs:
runs:
using: "composite"
steps:
- uses: actions/setup-java@v4
- uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
id: setup-gradle-jdk
with:
distribution: temurin
java-version: 21
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
- shell: bash
env:
JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-test-jdk/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ inputs:
runs:
using: "composite"
steps:
- uses: actions/setup-java@v4
- uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
with:
distribution: ${{ inputs.distribution }}
java-version: 8
Expand Down
35 changes: 35 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
'github>junit-team/renovate-config',
],
packageRules: [
{
matchCurrentValue: '/^2\\./',
allowedVersions: '(,3.0)',
matchPackageNames: [
'org.codehaus.groovy:{/,}**',
],
},
{
matchCurrentValue: '/^4\\./',
allowedVersions: '(,5.0)',
matchPackageNames: [
'org.apache.groovy:{/,}**',
],
},
{
matchCurrentValue: '/^1\\./',
allowedVersions: '/^1\\..*-groovy-2\\.*/',
matchPackageNames: [
'org.spockframework:{/,}**',
],
},
{
allowedVersions: '!/-SNAPSHOT$/',
matchPackageNames: [
'org.opentest4j.reporting:{/,}**',
],
},
],
}
2 changes: 1 addition & 1 deletion .github/workflows/close-inactive-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
with:
only-labels: "status: waiting-for-feedback"
days-before-stale: 14
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- javascript
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3
with:
languages: ${{ matrix.language }}
tools: latest
Expand All @@ -44,4 +44,4 @@ jobs:
-Dscan.tag.CodeQL \
allMainClasses
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3
16 changes: 0 additions & 16 deletions .github/workflows/combine-prs.yml

This file was deleted.

14 changes: 9 additions & 5 deletions .github/workflows/cross-version.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Cross-Version

on:
schedule:
- cron: '0 0 * * 6' # Every Saturday at 00:00 UTC
push:
branches:
- main
Expand All @@ -27,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Set up Test JDK
Expand All @@ -47,7 +49,8 @@ jobs:
arguments: |
-PjavaToolchain.version=${{ matrix.jdk.version }} \
-Dscan.tag.JDK_${{ matrix.jdk.version }} \
build
build \
--configuration-cache
openj9:
strategy:
fail-fast: false
Expand All @@ -57,15 +60,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Set up Test JDK
uses: ./.github/actions/setup-test-jdk
with:
distribution: semeru
- name: 'Set up JDK ${{ matrix.jdk }}'
uses: actions/setup-java@v4
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
with:
distribution: semeru
java-version: ${{ matrix.jdk }}
Expand All @@ -81,4 +84,5 @@ jobs:
-PjavaToolchain.implementation=j9 \
-Dscan.tag.JDK_${{ matrix.jdk }} \
-Dscan.tag.OpenJ9 \
build
build \
--configuration-cache
6 changes: 3 additions & 3 deletions .github/workflows/gradle-dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
with:
distribution: temurin
java-version: 21
check-latest: true
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v4
uses: gradle/actions/dependency-submission@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Label new issues
name: Add label to opened issues
on:
issues:
types:
Expand All @@ -9,7 +9,7 @@ jobs:
permissions:
issues: write
steps:
- uses: actions/github-script@v7
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
with:
script: |
github.rest.issues.addLabels({
Expand Down
30 changes: 14 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Install GraalVM
uses: graalvm/setup-graalvm@v1
uses: graalvm/setup-graalvm@22cc13fe88ef133134b3798e128fb208df55e1f5 # v1
with:
distribution: graalvm-community
version: 'latest'
Expand All @@ -34,17 +34,18 @@ jobs:
-Ptesting.enableJaCoCo \
:platform-tooling-support-tests:test \
build \
jacocoRootReport
jacocoRootReport \
--configuration-cache
- name: Upload to Codecov.io
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4
with:
token: ${{ secrets.CODECOV_TOKEN }}

Windows:
runs-on: windows-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Build
Expand All @@ -54,7 +55,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Build
Expand All @@ -70,7 +71,7 @@ jobs:
if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Publish
Expand All @@ -81,23 +82,22 @@ jobs:
with:
arguments: |
publish -x check \
prepareGitHubAttestation \
--no-configuration-cache
prepareGitHubAttestation
- name: Generate build provenance attestations
uses: actions/attest-build-provenance@210c1913531870065f03ce1f9440dd87bc0938cd # v1.4.0
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
with:
subject-path: documentation/build/attestation/*.jar

documentation:
name: Build Documentation
concurrency:
group: github-pages
group: github-pages-${{ github.ref }}
cancel-in-progress: true
needs: Linux
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Install Graphviz
Expand All @@ -109,15 +109,13 @@ jobs:
with:
arguments: |
prepareDocsForUploadToGhPages \
-Dscan.tag.Documentation \
--no-configuration-cache
-Dscan.tag.Documentation
- name: Upload Documentation
if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
uses: ./.github/actions/run-gradle
with:
arguments: |
gitPublishPush \
-Dscan.tag.Documentation \
--no-configuration-cache
-Dscan.tag.Documentation
env:
GRGIT_USER: ${{ secrets.GH_TOKEN }}
6 changes: 4 additions & 2 deletions .github/workflows/reproducible-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 1
- name: Restore Gradle cache and display toolchains
uses: ./.github/actions/run-gradle
with:
arguments: --quiet
arguments: |
--quiet \
--configuration-cache
- name: Build and compare checksums
shell: bash
run: |
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/unlabel-closed-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Check/remove status labels from closed issues
on:
issues:
types:
- closed
jobs:
label_issues:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
with:
script: |
const issue = await github.rest.issues.get({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
});
const originalLabels = issue.data.labels.map(l => l.name);
const newLabels = originalLabels.filter(l => l !== "status: in progress" && l !== "status: new");
if (newLabels.length !== originalLabels.length) {
await github.rest.issues.update({
issue_number: issue.data.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: newLabels,
});
}
const statusLabels = newLabels.filter(l => l.startsWith("status: "));
if (issue.data.state_reason === "not_planned" && statusLabels.length === 0) {
await github.rest.issues.createComment({
issue_number: issue.data.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: "Please assign a status label to this issue.",
});
await github.rest.issues.update({
issue_number: issue.data.number,
owner: context.repo.owner,
repo: context.repo.repo,
state: "open",
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*Scope:* minor bug fixes and improvements since 5.11.0

For a complete list of all _closed_ issues and pull requests for this release, consult the
link:{junit5-repo}+/milestone/79?closed=1+[5.11.1] milestone page in the
JUnit repository on GitHub.
link:{junit5-repo}+/milestone/79?closed=1+[5.11.1] milestone page in the JUnit repository
on GitHub.


[[release-notes-5.11.1-junit-platform]]
Expand All @@ -16,7 +16,8 @@ JUnit repository on GitHub.
[[release-notes-5.11.1-junit-platform-bug-fixes]]
==== Bug Fixes

* ❓
* Fixed potential locking issue with `ExclusiveResource` in the
`HierarchicalTestExecutorService`, which could lead to deadlocks in certain scenarios.

[[release-notes-5.11.1-junit-platform-deprecations-and-breaking-changes]]
==== Deprecations and Breaking Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ JUnit repository on GitHub.
[[release-notes-5.12.0-M1-junit-platform-bug-fixes]]
==== Bug Fixes

* ❓
* Fix support for disabling ANSI colors on the console when the `NO_COLOR` environment
variable is available.

[[release-notes-5.12.0-M1-junit-platform-deprecations-and-breaking-changes]]
==== Deprecations and Breaking Changes
Expand Down
Loading

0 comments on commit e8d11bd

Please sign in to comment.