Skip to content

Commit 3399bed

Browse files
Merge branch 'main' into issues/3485-console-launcher-select-multiple-values
# Conflicts: # junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java # platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
2 parents 3489f76 + f37db92 commit 3399bed

File tree

35 files changed

+222
-69
lines changed

35 files changed

+222
-69
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ runs:
2121
run: |
2222
./gradlew \
2323
-Porg.gradle.java.installations.auto-download=false \
24-
-Pjunit.develocity.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }} \
24+
-Pjunit.develocity.predictiveTestSelection.enabled=true \
25+
-Pjunit.develocity.predictiveTestSelection.selectRemainingTests=${{ github.event_name != 'pull_request' }} \
2526
"-Dscan.value.GitHub job=${{ github.job }}" \
2627
javaToolchains \
2728
${{ inputs.arguments }}

.github/workflows/close-inactive-issues.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
schedule:
44
- cron: "30 1 * * *"
55
workflow_dispatch:
6+
permissions: read-all
67
jobs:
78
close-issues:
89
runs-on: ubuntu-latest

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
schedule:
1414
- cron: '0 19 * * 3'
1515

16+
permissions: read-all
17+
1618
env:
1719
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1820

@@ -32,7 +34,7 @@ jobs:
3234
- name: Check out repository
3335
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
3436
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3
37+
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3
3638
with:
3739
languages: ${{ matrix.language }}
3840
tools: linked
@@ -44,4 +46,4 @@ jobs:
4446
-Dscan.tag.CodeQL \
4547
allMainClasses
4648
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3
49+
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3

.github/workflows/cross-version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111
branches:
1212
- '*'
1313

14+
permissions: read-all
15+
1416
env:
1517
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1618

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ on:
55
branches:
66
- main
77

8-
permissions:
9-
contents: write
8+
permissions: read-all
109

1110
jobs:
1211
dependency-submission:
1312
if: github.repository == 'junit-team/junit5'
1413
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
1516
steps:
1617
- name: Check out repository
1718
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

.github/workflows/label-opened-issues.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
issues:
44
types:
55
- opened
6+
permissions: read-all
67
jobs:
78
label_issues:
89
runs-on: ubuntu-latest

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
branches:
1010
- '*'
1111

12+
permissions: read-all
13+
1214
env:
1315
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1416

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: OpenSSF Scorecard supply-chain security analysis
2+
3+
on:
4+
branch_protection_rule:
5+
schedule:
6+
- cron: '31 20 * * 6'
7+
push:
8+
branches: [ "main" ]
9+
10+
permissions: read-all
11+
12+
jobs:
13+
analysis:
14+
name: Scorecard analysis
15+
runs-on: ubuntu-latest
16+
permissions:
17+
# Needed to upload the results to code-scanning dashboard.
18+
security-events: write
19+
# Needed to publish results and get a badge (see publish_results below).
20+
id-token: write
21+
22+
steps:
23+
- name: "Checkout code"
24+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
25+
with:
26+
persist-credentials: false
27+
28+
- name: "Run analysis"
29+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
30+
with:
31+
results_file: results.sarif
32+
results_format: sarif
33+
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
34+
# - you want to enable the Branch-Protection check on a *public* repository, or
35+
# - you are installing Scorecard on a *private* repository
36+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
37+
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
38+
39+
# Public repositories:
40+
# - Publish results to OpenSSF REST API for easy access by consumers
41+
# - Allows the repository to include the Scorecard badge.
42+
# - See https://github.com/ossf/scorecard-action#publishing-results.
43+
# For private repositories:
44+
# - `publish_results` will always be set to `false`, regardless
45+
# of the value entered here.
46+
publish_results: true
47+
48+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
49+
# format to the repository Actions tab.
50+
- name: "Upload artifact"
51+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.pre.node20
52+
with:
53+
name: SARIF file
54+
path: results.sarif
55+
retention-days: 5
56+
57+
# Upload the results to GitHub's code scanning dashboard (optional).
58+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
59+
- name: "Upload to code-scanning"
60+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3
61+
with:
62+
sarif_file: results.sarif

.github/workflows/reproducible-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
branches:
1010
- '*'
1111

12+
permissions: read-all
13+
1214
env:
1315
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1416

.github/workflows/unlabel-closed-issues.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
issues:
44
types:
55
- closed
6+
permissions: read-all
67
jobs:
78
label_issues:
89
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)