Skip to content

Commit 7cf0b7e

Browse files
brunoborgesbrunoborges
authored
Merge branch 'main' into feat/mvn-server-credentials
2 parents 4148ade + 668c1ea commit 7cf0b7e

12 files changed

Lines changed: 221 additions & 65 deletions

‎.github/ISSUE_TEMPLATE/new_distribution_request.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: New Java distribution template
3+
about: Suggest a new Java distribution
4+
title: ''
5+
labels: feature request, needs triage
6+
assignees: ''
7+
---
8+
9+
**Description:**
10+
Describe your proposal.
11+
12+
**Justification:**
13+
Justification or a use case for your proposal.
14+
15+
**Download URL:**
16+
Download URL for the new distribution.
17+
18+
**License:**
19+
Link to the license for the new distribution.
20+
21+
**Are you willing to submit a PR?**
22+
<!--- We accept contributions! -->

‎.github/PULL_REQUEST_TEMPLATE/new_distribution_pull_request_template.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
**Description:**
2+
Describe your changes.
3+
4+
**Related issue:**
5+
Add link to the related issue.
6+
7+
**Download URL:**
8+
Download URL for the new distribution.
9+
10+
**License:**
11+
Link to the license for the new distribution.
12+
13+
**Check list:**
14+
- [ ] Mark if documentation changes are required.
15+
- [ ] Mark if tests were added or updated to cover the changes.
16+
- [ ] Mark if new distribution is being added.

‎.github/workflows/e2e-cache-dependency-path.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
os: [macos-latest, windows-latest, ubuntu-latest]
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
- name: Run setup-java with the cache for gradle
2929
uses: ./
3030
id: setup-java
@@ -51,7 +51,7 @@ jobs:
5151
needs: gradle1-save
5252
steps:
5353
- name: Checkout
54-
uses: actions/checkout@v6
54+
uses: actions/checkout@v7
5555
- name: Run setup-java with the cache for gradle
5656
uses: ./
5757
id: setup-java
@@ -76,7 +76,7 @@ jobs:
7676
needs: gradle1-save
7777
steps:
7878
- name: Checkout
79-
uses: actions/checkout@v6
79+
uses: actions/checkout@v7
8080
- name: Run setup-java with the cache for gradle
8181
uses: ./
8282
id: setup-java

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
os: [macos-15-intel, windows-latest, ubuntu-latest]
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
- name: Run setup-java with the cache for gradle
2929
uses: ./
3030
id: setup-java
@@ -50,7 +50,7 @@ jobs:
5050
needs: gradle-save
5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v6
53+
uses: actions/checkout@v7
5454
- name: Run setup-java with the cache for gradle
5555
uses: ./
5656
id: setup-java
@@ -73,7 +73,7 @@ jobs:
7373
os: [macos-15-intel, windows-latest, ubuntu-latest]
7474
steps:
7575
- name: Checkout
76-
uses: actions/checkout@v6
76+
uses: actions/checkout@v7
7777
- name: Run setup-java with the cache for maven
7878
uses: ./
7979
id: setup-java
@@ -97,7 +97,7 @@ jobs:
9797
needs: maven-save
9898
steps:
9999
- name: Checkout
100-
uses: actions/checkout@v6
100+
uses: actions/checkout@v7
101101
- name: Run setup-java with the cache for maven
102102
uses: ./
103103
id: setup-java
@@ -124,7 +124,7 @@ jobs:
124124
os: [macos-15-intel, windows-latest, ubuntu-22.04]
125125
steps:
126126
- name: Checkout
127-
uses: actions/checkout@v6
127+
uses: actions/checkout@v7
128128
- name: Run setup-java with the cache for sbt
129129
uses: ./
130130
id: setup-java
@@ -174,7 +174,7 @@ jobs:
174174
needs: sbt-save
175175
steps:
176176
- name: Checkout
177-
uses: actions/checkout@v6
177+
uses: actions/checkout@v7
178178
- name: Run setup-java with the cache for sbt
179179
uses: ./
180180
id: setup-java

‎.github/workflows/e2e-local-file.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
os: [macos-latest, windows-latest, ubuntu-latest]
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v7
2525
- name: Download Adopt OpenJDK file
2626
run: |
2727
if ($IsLinux) {
@@ -58,7 +58,7 @@ jobs:
5858
os: [macos-latest, windows-latest, ubuntu-latest]
5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v6
61+
uses: actions/checkout@v7
6262
- name: Download Zulu OpenJDK file
6363
run: |
6464
if ($IsLinux) {
@@ -95,7 +95,7 @@ jobs:
9595
os: [macos-latest, windows-latest, ubuntu-latest]
9696
steps:
9797
- name: Checkout
98-
uses: actions/checkout@v6
98+
uses: actions/checkout@v7
9999
- name: Download Eclipse Temurin file
100100
run: |
101101
if ($IsLinux) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
os: [macos-latest, windows-latest, ubuntu-latest]
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v6
28+
uses: actions/checkout@v7
2929
- name: setup-java
3030
uses: ./
3131
id: setup-java
@@ -60,7 +60,7 @@ jobs:
6060
os: [macos-latest, windows-latest, ubuntu-latest]
6161
steps:
6262
- name: Checkout
63-
uses: actions/checkout@v6
63+
uses: actions/checkout@v7
6464
- name: Create fake settings.xml
6565
run: |
6666
$xmlDirectory = Join-Path $HOME ".m2"
@@ -96,7 +96,7 @@ jobs:
9696
os: [macos-latest, windows-latest, ubuntu-latest]
9797
steps:
9898
- name: Checkout
99-
uses: actions/checkout@v6
99+
uses: actions/checkout@v7
100100
- name: Create fake settings.xml
101101
run: |
102102
$xmlDirectory = Join-Path $HOME ".m2"
@@ -133,7 +133,7 @@ jobs:
133133
os: [macos-latest, windows-latest, ubuntu-latest]
134134
steps:
135135
- name: Checkout
136-
uses: actions/checkout@v6
136+
uses: actions/checkout@v7
137137
- name: setup-java
138138
uses: ./
139139
id: setup-java

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
version: '24-ea'
7474
steps:
7575
- name: Checkout
76-
uses: actions/checkout@v6
76+
uses: actions/checkout@v7
7777
- name: setup-java
7878
uses: ./
7979
id: setup-java
@@ -99,7 +99,7 @@ jobs:
9999
version: ['21', '17']
100100
steps:
101101
- name: Checkout
102-
uses: actions/checkout@v6
102+
uses: actions/checkout@v7
103103
- name: Install bash
104104
run: apk add --no-cache bash
105105
- name: setup-java
@@ -149,7 +149,7 @@ jobs:
149149
version: '17.0.7'
150150
steps:
151151
- name: Checkout
152-
uses: actions/checkout@v6
152+
uses: actions/checkout@v7
153153
- name: setup-java
154154
uses: ./
155155
id: setup-java
@@ -184,7 +184,7 @@ jobs:
184184
os: macos-latest
185185
steps:
186186
- name: Checkout
187-
uses: actions/checkout@v6
187+
uses: actions/checkout@v7
188188
- name: setup-java
189189
uses: ./
190190
id: setup-java
@@ -220,7 +220,7 @@ jobs:
220220
os: macos-latest
221221
steps:
222222
- name: Checkout
223-
uses: actions/checkout@v6
223+
uses: actions/checkout@v7
224224
- name: setup-java
225225
uses: ./
226226
id: setup-java
@@ -259,7 +259,7 @@ jobs:
259259
version: ['17-ea', '15.0.0-ea.14']
260260
steps:
261261
- name: Checkout
262-
uses: actions/checkout@v6
262+
uses: actions/checkout@v7
263263
- name: setup-java
264264
uses: ./
265265
id: setup-java
@@ -281,7 +281,7 @@ jobs:
281281
version: ['17-ea']
282282
steps:
283283
- name: Checkout
284-
uses: actions/checkout@v6
284+
uses: actions/checkout@v7
285285
- name: setup-java
286286
uses: ./
287287
id: setup-java
@@ -303,7 +303,7 @@ jobs:
303303
version: ['17-ea', '21-ea']
304304
steps:
305305
- name: Checkout
306-
uses: actions/checkout@v6
306+
uses: actions/checkout@v7
307307
- name: setup-java
308308
uses: ./
309309
id: setup-java
@@ -390,7 +390,7 @@ jobs:
390390

391391
steps:
392392
- name: Checkout
393-
uses: actions/checkout@v6
393+
uses: actions/checkout@v7
394394
- name: setup-java
395395
uses: ./
396396
id: setup-java
@@ -418,7 +418,7 @@ jobs:
418418
version: ['11']
419419
steps:
420420
- name: Checkout
421-
uses: actions/checkout@v6
421+
uses: actions/checkout@v7
422422
- name: setup-java
423423
uses: ./
424424
id: setup-java
@@ -441,7 +441,7 @@ jobs:
441441
java-version-file: ['.java-version', '.tool-versions']
442442
steps:
443443
- name: Checkout
444-
uses: actions/checkout@v6
444+
uses: actions/checkout@v7
445445
- name: Create .java-version file
446446
shell: bash
447447
run: echo "17" > .java-version
@@ -470,7 +470,7 @@ jobs:
470470
java-version-file: ['.java-version', '.tool-versions']
471471
steps:
472472
- name: Checkout
473-
uses: actions/checkout@v6
473+
uses: actions/checkout@v7
474474
- name: Create .java-version file
475475
shell: bash
476476
run: echo "11" > .java-version
@@ -498,7 +498,7 @@ jobs:
498498
java-version-file: ['.java-version', '.tool-versions']
499499
steps:
500500
- name: Checkout
501-
uses: actions/checkout@v6
501+
uses: actions/checkout@v7
502502
- name: Create .java-version file
503503
shell: bash
504504
run: echo "17.0.10" > .java-version
@@ -526,7 +526,7 @@ jobs:
526526
java-version-file: ['.java-version', '.tool-versions', '.sdkmanrc']
527527
steps:
528528
- name: Checkout
529-
uses: actions/checkout@v6
529+
uses: actions/checkout@v7
530530
- name: Create .java-version file
531531
shell: bash
532532
run: echo "openjdk64-17.0.10" > .java-version

‎.github/workflows/publish-immutable-actions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checking out
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@v7
1919
- name: Publish
2020
id: publish
2121
uses: actions/publish-immutable-action@v0.0.4

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ For more details, see the full release notes on the [releases page](https://git
3737

3838
- `architecture`: The target architecture of the package. Possible values: `x86`, `x64`, `armv7`, `aarch64`, `ppc64le`. Default value: Derived from the runner machine.
3939

40-
- `jdkFile`: If a use-case requires a custom distribution setup-java uses the compressed JDK from the location pointed by this input and will take care of the installation and caching on the VM.
40+
- `jdkFile`: If a use-case requires a custom distribution setup-java uses the compressed JDK from the location pointed by this input and will take care of the installation and caching on the VM. Note: `distribution` must be set to 'jdkfile' (case-sensitive; all lowercase) when using this option.
4141

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

@@ -78,7 +78,7 @@ steps:
7878
with:
7979
distribution: 'temurin' # See 'Supported distributions' for available options
8080
java-version: '25'
81-
- run: java HelloWorldApp.java
81+
- run: java --version
8282
```
8383
8484
#### Azul Zulu OpenJDK
@@ -89,7 +89,7 @@ steps:
8989
with:
9090
distribution: 'zulu' # See 'Supported distributions' for available options
9191
java-version: '25'
92-
- run: java HelloWorldApp.java
92+
- run: java --version
9393
```
9494
9595
#### Supported version syntax
@@ -115,6 +115,7 @@ Currently, the following distributions are supported:
115115
| `sapmachine` | [SAP SapMachine JDK/JRE](https://sapmachine.io/) | [`sapmachine` license](https://github.com/SAP/SapMachine/blob/sapmachine/LICENSE)
116116
| `graalvm` | [Oracle GraalVM](https://www.graalvm.org/) | [`graalvm` license](https://www.oracle.com/downloads/licenses/graal-free-license.html)
117117
| `jetbrains` | [JetBrains Runtime](https://github.com/JetBrains/JetBrainsRuntime/) | [`jetbrains` license](https://github.com/JetBrains/JetBrainsRuntime/blob/main/LICENSE)
118+
| `jdkfile` | Custom JDK Installation | |
118119

119120
> [!NOTE]
120121
> - The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
@@ -222,7 +223,7 @@ steps:
222223
distribution: 'temurin'
223224
java-version: '25'
224225
check-latest: true
225-
- run: java HelloWorldApp.java
226+
- run: java --version
226227
```
227228

228229
### Testing against different Java versions
@@ -241,7 +242,7 @@ jobs:
241242
with:
242243
distribution: '<distribution>'
243244
java-version: ${{ matrix.java }}
244-
- run: java HelloWorldApp.java
245+
- run: java --version
245246
```
246247

247248
### Install multiple JDKs

0 commit comments

Comments
 (0)