Skip to content

Commit a303da8

Browse files
CopilotCopilot
authored
Merge branch 'main' into feature/maven-args-no-transfer-progress
2 parents 5c0f591 + 324b333 commit a303da8

28 files changed

Lines changed: 1775 additions & 161 deletions

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ Describe your changes.
55
Add link to the related issue.
66

77
**Check list:**
8+
- [ ] Ran `npm run check` locally (format, lint, build, test) and all checks pass.
89
- [ ] Mark if documentation changes are required.
910
- [ ] Mark if tests were added or updated to cover the changes.

‎.github/workflows/e2e-versions.yml‎

Lines changed: 62 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919

2020
jobs:
2121
setup-java-major-versions:
22-
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
22+
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ contains(matrix.os, 'macos') && !contains(matrix.os, 'intel') && 'arm64' || 'x64' }}) - ${{ matrix.os }}
2323
runs-on: ${{ matrix.os }}
2424
strategy:
2525
fail-fast: false
@@ -96,7 +96,7 @@ jobs:
9696
shell: bash
9797

9898
setup-java-alpine-linux:
99-
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - alpine-linux - ${{ matrix.os }}
99+
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ contains(matrix.os, 'macos') && !contains(matrix.os, 'intel') && 'arm64' || 'x64' }}) - alpine-linux - ${{ matrix.os }}
100100
runs-on: ${{ matrix.os }}
101101
container:
102102
image: alpine:3.21
@@ -127,7 +127,7 @@ jobs:
127127
shell: bash
128128

129129
setup-java-major-minor-versions:
130-
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
130+
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ contains(matrix.os, 'macos') && !contains(matrix.os, 'intel') && 'arm64' || 'x64' }}) - ${{ matrix.os }}
131131
needs: setup-java-major-versions
132132
runs-on: ${{ matrix.os }}
133133
strategy:
@@ -275,7 +275,7 @@ jobs:
275275
shell: bash
276276

277277
setup-java-ea-versions-zulu:
278-
name: zulu ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
278+
name: zulu ${{ matrix.version }} (jdk-${{ contains(matrix.os, 'macos') && !contains(matrix.os, 'intel') && 'arm64' || 'x64' }}) - ${{ matrix.os }}
279279
needs: setup-java-major-minor-versions
280280
runs-on: ${{ matrix.os }}
281281
strategy:
@@ -302,7 +302,7 @@ jobs:
302302
shell: bash
303303

304304
setup-java-ea-versions-temurin:
305-
name: temurin ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
305+
name: temurin ${{ matrix.version }} (jdk-${{ contains(matrix.os, 'macos') && !contains(matrix.os, 'intel') && 'arm64' || 'x64' }}) - ${{ matrix.os }}
306306
needs: setup-java-major-minor-versions
307307
runs-on: ${{ matrix.os }}
308308
strategy:
@@ -328,8 +328,64 @@ jobs:
328328
run: bash __tests__/verify-java.sh "$JAVA_VERSION" "$JAVA_PATH"
329329
shell: bash
330330

331+
setup-java-temurin-signature-verification:
332+
name: temurin ${{ matrix.version }} signature verification - ${{ matrix.os }}
333+
needs: setup-java-major-minor-versions
334+
runs-on: ${{ matrix.os }}
335+
strategy:
336+
fail-fast: false
337+
matrix:
338+
os: [macos-latest, windows-latest, ubuntu-latest]
339+
version: ['21', '17']
340+
steps:
341+
- name: Checkout
342+
uses: actions/checkout@v7
343+
with:
344+
persist-credentials: false
345+
- name: setup-java with signature verification
346+
uses: ./
347+
id: setup-java
348+
with:
349+
java-version: ${{ matrix.version }}
350+
distribution: temurin
351+
verify-signature: true
352+
- name: Verify Java
353+
env:
354+
JAVA_VERSION: ${{ matrix.version }}
355+
JAVA_PATH: ${{ steps.setup-java.outputs.path }}
356+
run: bash __tests__/verify-java.sh "$JAVA_VERSION" "$JAVA_PATH"
357+
shell: bash
358+
359+
setup-java-microsoft-signature-verification:
360+
name: microsoft ${{ matrix.version }} signature verification - ${{ matrix.os }}
361+
needs: setup-java-major-minor-versions
362+
runs-on: ${{ matrix.os }}
363+
strategy:
364+
fail-fast: false
365+
matrix:
366+
os: [macos-latest, windows-latest, ubuntu-latest]
367+
version: ['21', '17']
368+
steps:
369+
- name: Checkout
370+
uses: actions/checkout@v7
371+
with:
372+
persist-credentials: false
373+
- name: setup-java with signature verification
374+
uses: ./
375+
id: setup-java
376+
with:
377+
java-version: ${{ matrix.version }}
378+
distribution: microsoft
379+
verify-signature: true
380+
- name: Verify Java
381+
env:
382+
JAVA_VERSION: ${{ matrix.version }}
383+
JAVA_PATH: ${{ steps.setup-java.outputs.path }}
384+
run: bash __tests__/verify-java.sh "$JAVA_VERSION" "$JAVA_PATH"
385+
shell: bash
386+
331387
setup-java-ea-versions-sapmachine:
332-
name: sapmachine ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
388+
name: sapmachine ${{ matrix.version }} (jdk-${{ contains(matrix.os, 'macos') && !contains(matrix.os, 'intel') && 'arm64' || 'x64' }}) - ${{ matrix.os }}
333389
needs: setup-java-major-minor-versions
334390
runs-on: ${{ matrix.os }}
335391
strategy:

‎.github/workflows/zizmor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
security-events: write # to upload SARIF results to code scanning
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v6
26+
uses: actions/checkout@v7
2727
with:
2828
persist-credentials: false
2929

3030
- name: Set up Python
31-
uses: actions/setup-python@v5
31+
uses: actions/setup-python@v6
3232
with:
3333
python-version: '3.x'
3434

@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Upload SARIF results to code scanning
4444
if: always() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
45-
uses: github/codeql-action/upload-sarif@v3
45+
uses: github/codeql-action/upload-sarif@v4
4646
with:
4747
sarif_file: zizmor.sarif
4848
category: zizmor

‎.husky/pre-commit‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npx lint-staged

‎.husky/pre-push‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm run build && npm test

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ For more details, see the full release notes on the [releases page](https://git
4141

4242
- `check-latest`: Setting this option makes the action to check for the latest available version for the version spec.
4343

44+
- `verify-signature`: Verifies downloaded Java package signatures when supported by the selected distribution. Currently supported for `temurin` and `microsoft`. If set to `true` for unsupported distributions, the action fails.
45+
46+
- `verify-signature-public-key`: ASCII-armored GPG public key used to verify the downloaded package signature. Overrides the default bundled key for the selected distribution.
47+
4448
- `cache`: Quick [setup caching](#caching-packages-dependencies) for the dependencies managed through one of the predefined package managers. It can be one of "maven", "gradle" or "sbt".
4549

4650
- `cache-dependency-path`: The path to a dependency file: pom.xml, build.gradle, build.sbt, etc. This option can be used with the `cache` option. If this option is omitted, the action searches for the dependency file in the entire repository. This option supports wildcards and a list of file names for caching multiple dependencies.

0 commit comments

Comments
 (0)
Sponsor
SponsoredKunjungi sekarang
Promo