Skip to content

Commit 190fda3

Browse files
authored
Merge branch 'adoptium:master' into update_gradle
2 parents 132a2f3 + f2d9858 commit 190fda3

File tree

156 files changed

+4562
-267
lines changed

Some content is hidden

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

156 files changed

+4562
-267
lines changed

.github/workflows/cacert-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
23+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
2424
with:
2525
disable-sudo: true
2626
egress-policy: block
@@ -38,7 +38,7 @@ jobs:
3838
services.gradle.org:443
3939
4040
- name: Checkout
41-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242

4343
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4444
with:
@@ -47,7 +47,7 @@ jobs:
4747
architecture: x64
4848
distribution: 'temurin'
4949

50-
- uses: jfrog/setup-jfrog-cli@751c204e8e1d3fe053e30218a2143ab4fe100d95 # v4.6.0
50+
- uses: jfrog/setup-jfrog-cli@279b1f629f43dd5bc658d8361ac4802a7ef8d2d5 # v4.9.1
5151
env:
5252
JF_URL: https://adoptium.jfrog.io
5353
JF_USER: ${{ secrets.ARTIFACTORY_USER }}

.github/workflows/linux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
cacerts: ${{ steps.cacerts.outputs.cacerts }}
3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
fetch-depth: 0
3535

@@ -112,7 +112,7 @@ jobs:
112112

113113
steps:
114114
- name: Checkout
115-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
115+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
116116

117117
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
118118
with:
@@ -146,7 +146,7 @@ jobs:
146146

147147
steps:
148148
- name: Checkout
149-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
149+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
150150

151151
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
152152
with:
@@ -198,5 +198,5 @@ jobs:
198198
if: github.event_name == 'pull_request' || github.repository_owner != 'adoptium'
199199
runs-on: ubuntu-latest
200200
steps:
201-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
202-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
201+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
202+
- uses: gradle/actions/wrapper-validation@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4

.github/workflows/linuxTriage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
checks: write
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3 # v2.1.1
15+
- uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
1616
with:
1717
artifact: test-results # artifact name
1818
name: JUnit Test Report # Name of the check run which will be created

.github/workflows/pkgbuild.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ jobs:
2323
runs-on: macos-latest
2424
steps:
2525

26-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727

2828
- name: Install dependencies
29-
run: brew install --cask packages
29+
run: |
30+
brew update
31+
brew install --cask packages
3032
3133
- name: Fetch latest macOS version from Adoptium API
3234
run: |

.github/workflows/scorecards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131

3232
steps:
3333
- name: "Checkout code"
34-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535
with:
3636
persist-credentials: false
3737

3838
- name: "Run analysis"
39-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
39+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
4040
with:
4141
results_file: results.sarif
4242
results_format: sarif
@@ -66,6 +66,6 @@ jobs:
6666

6767
# Upload the results to GitHub's code scanning dashboard.
6868
- name: "Upload to code-scanning"
69-
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
69+
uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
7070
with:
7171
sarif_file: results.sarif

.github/workflows/wix.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: wix
2828
runs-on: windows-latest
2929
steps:
30-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131

3232
- name: Install wix toolset
3333
run: dotnet tool install --global wix --version 6.0.0 --verbosity quiet
@@ -91,6 +91,7 @@ jobs:
9191
run: call Build.OpenJDK_generic.cmd
9292
working-directory: wix
9393
env:
94+
WIN_SDK_FULL_VERSION: "10.0.26100.0"
9495
PRODUCT_CATEGORY: jdk
9596
ARCH: ${{ matrix.ARCH }}
9697
JVM: ${{ matrix.JVM }}
@@ -100,6 +101,7 @@ jobs:
100101
run: call Build.OpenJDK_generic.cmd
101102
working-directory: wix
102103
env:
104+
WIN_SDK_FULL_VERSION: "10.0.26100.0"
103105
PRODUCT_CATEGORY: jre
104106
ARCH: ${{ matrix.ARCH }}
105107
JVM: ${{ matrix.JVM }}

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ Thumbs.db
3030

3131
node_modules/
3232
wix/Workdir/
33+
34+
inno_setup/output/
35+
inno_setup/src/
36+
inno_setup/workspace/

docs/Guide_To_The_Linux_Installers.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Supported Linux Distros:
4545
Distribution Type| Supported Versions
4646
----------|---------
4747
Apk (Alpine)| All supported version.
48-
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Oracular (Ubuntu 24.10)</br>Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 22.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
48+
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 22.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
4949
RPM (RHEL)| centos 7</br> rocky 8</br>RHEL7 , RHEL8 & RHEL9</br> Fedora 35, 36, 37, 38 ,39 , 40</br>Oracle Linux 7 & 8</br>Amazon Linux 2
5050
RPM(SUSE) | Opensuse 15.3</br>Opensuse 15.4</br>Opensuse 15.5</br>SLES 12</br>SLES15
5151

@@ -430,7 +430,6 @@ For Debian based distributions a similar process is required, firstly add the di
430430
"bookworm", // Debian/12
431431
"bullseye", // Debian/11
432432
"buster", // Debian/10
433-
"oracular", // Ubuntu/24.10 (STS)
434433
"noble", // Ubuntu/24.04 (LTS)
435434
"jammy", // Ubuntu/22.04 (LTS)
436435
"focal", // Ubuntu/20.04 (LTS)
@@ -448,7 +447,7 @@ In addition to the updates detailed above, it is also important to change the fo
448447
the following line should be changed :
449448

450449
```
451-
debVersionList="trixie bookworm bullseye oracular noble jammy focal bionic"
450+
debVersionList="trixie bookworm bullseye noble jammy focal bionic"
452451
```
453452

454453
And similarly in the following two files
@@ -464,7 +463,6 @@ The array needs to be updated to add or remove distributions as necessary as sho
464463
Arguments.of("debian", "trixie"), // Debian/13 (testing)
465464
Arguments.of("debian", "bookworm"), // Debian/12 (testing)
466465
Arguments.of("debian", "bullseye"), // Debian/11 (stable)
467-
Arguments.of("ubuntu", "oracular"), // Ubuntu/24.10 (STS)
468466
Arguments.of("ubuntu", "noble"), // Ubuntu/24.04 (LTS)
469467
Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
470468
Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS)

0 commit comments

Comments
 (0)