Skip to content

Commit a2081b9

Browse files
authored
Merge branch 'main' into support-kona-jdk
2 parents 39f01ea + b150355 commit a2081b9

27 files changed

Lines changed: 1755 additions & 151 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: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,62 @@ jobs:
329329
run: bash __tests__/verify-java.sh "$JAVA_VERSION" "$JAVA_PATH"
330330
shell: bash
331331

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

‎.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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npx lint-staged

‎.husky/pre-push‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
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)