Skip to content

Commit edb6c11

Browse files
HarithaVattikutiHarithaVattikuti
authored
Merge branch 'actions:main' into main
2 parents 867e962 + 83a06ff commit edb6c11

32 files changed

+89637
-262
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [macos-latest, windows-latest, ubuntu-latest]
25+
os: [macos-13, windows-latest, ubuntu-latest]
2626
steps:
2727
- name: Checkout
2828
uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
os: [macos-latest, windows-latest, ubuntu-latest]
50+
os: [macos-13, windows-latest, ubuntu-latest]
5151
needs: gradle-save
5252
steps:
5353
- name: Checkout
@@ -71,7 +71,7 @@ jobs:
7171
strategy:
7272
fail-fast: false
7373
matrix:
74-
os: [macos-latest, windows-latest, ubuntu-latest]
74+
os: [macos-13, windows-latest, ubuntu-latest]
7575
steps:
7676
- name: Checkout
7777
uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
9494
strategy:
9595
fail-fast: false
9696
matrix:
97-
os: [macos-latest, windows-latest, ubuntu-latest]
97+
os: [macos-13, windows-latest, ubuntu-latest]
9898
needs: maven-save
9999
steps:
100100
- name: Checkout
@@ -122,7 +122,7 @@ jobs:
122122
strategy:
123123
fail-fast: false
124124
matrix:
125-
os: [macos-latest, windows-latest, ubuntu-latest]
125+
os: [macos-13, windows-latest, ubuntu-latest]
126126
steps:
127127
- name: Checkout
128128
uses: actions/checkout@v4
@@ -133,33 +133,35 @@ jobs:
133133
distribution: 'adopt'
134134
java-version: '11'
135135
cache: sbt
136+
- name: Setup SBT
137+
if: matrix.os == 'macos-13'
138+
run: |
139+
echo ""Installing SBT...""
140+
brew install sbt
136141
- name: Create files to cache
137142
run: sbt update
138143

139144
- name: Check files to cache on macos-latest
140-
if: matrix.os == 'macos-latest'
145+
if: matrix.os == 'macos-13'
141146
run: |
142147
if [ ! -d ~/Library/Caches/Coursier ]; then
143148
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
144149
exit 1
145150
fi
146-
147151
- name: Check files to cache on windows-latest
148152
if: matrix.os == 'windows-latest'
149153
run: |
150154
if [ ! -d ~/AppData/Local/Coursier/Cache ]; then
151155
echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly"
152156
exit 1
153157
fi
154-
155158
- name: Check files to cache on ubuntu-latest
156159
if: matrix.os == 'ubuntu-latest'
157160
run: |
158161
if [ ! -d ~/.cache/coursier ]; then
159162
echo "::error::The ~/.cache/coursier directory does not exist unexpectedly"
160163
exit 1
161164
fi
162-
163165
sbt-restore:
164166
runs-on: ${{ matrix.os }}
165167
defaults:
@@ -169,7 +171,7 @@ jobs:
169171
strategy:
170172
fail-fast: false
171173
matrix:
172-
os: [macos-latest, windows-latest, ubuntu-latest]
174+
os: [macos-13, windows-latest, ubuntu-latest]
173175
needs: sbt-save
174176
steps:
175177
- name: Checkout
@@ -183,14 +185,13 @@ jobs:
183185
cache: sbt
184186

185187
- name: Confirm that ~/Library/Caches/Coursier directory has been made
186-
if: matrix.os == 'macos-latest'
188+
if: matrix.os == 'macos-13'
187189
run: |
188190
if [ ! -d ~/Library/Caches/Coursier ]; then
189191
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
190192
exit 1
191193
fi
192194
ls ~/Library/Caches/Coursier
193-
194195
- name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made
195196
if: matrix.os == 'windows-latest'
196197
run: |
@@ -199,7 +200,6 @@ jobs:
199200
exit 1
200201
fi
201202
ls ~/AppData/Local/Coursier/Cache
202-
203203
- name: Confirm that ~/.cache/coursier directory has been made
204204
if: matrix.os == 'ubuntu-latest'
205205
run: |

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

Lines changed: 71 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [macos-latest, windows-latest, ubuntu-latest]
23+
os: [macos-13, windows-latest, ubuntu-latest]
2424
distribution: [
2525
'temurin',
2626
'adopt',
@@ -30,25 +30,37 @@ jobs:
3030
'microsoft',
3131
'semeru',
3232
'corretto',
33-
'dragonwell'
33+
'dragonwell',
34+
'sapmachine'
3435
] # internally 'adopt-hotspot' is the same as 'adopt'
35-
version: ['8', '11', '17']
36+
version: ['21', '11', '17']
3637
exclude:
3738
- distribution: microsoft
3839
version: 8
3940
- distribution: dragonwell
40-
os: macos-latest
41+
os: macos-13
4142
include:
4243
- distribution: oracle
43-
os: macos-latest
44+
os: macos-13
4445
version: 17
4546
- distribution: oracle
4647
os: windows-latest
47-
version: 20
48+
version: 21
4849
- distribution: oracle
4950
os: ubuntu-latest
50-
version: 20
51-
51+
version: 21
52+
- distribution: graalvm
53+
os: macos-latest
54+
version: 17
55+
- distribution: graalvm
56+
os: windows-latest
57+
version: 21
58+
- distribution: graalvm
59+
os: ubuntu-latest
60+
version: 21
61+
- distribution: graalvm
62+
os: ubuntu-latest
63+
version: '24-ea'
5264
steps:
5365
- name: Checkout
5466
uses: actions/checkout@v4
@@ -73,18 +85,24 @@ jobs:
7385
distribution: ['temurin', 'zulu', 'liberica']
7486
version:
7587
- '11.0'
76-
- '8.0.302'
88+
- '21.0'
7789
- '17.0.7+7'
7890
include:
7991
- distribution: oracle
8092
os: ubuntu-latest
81-
version: '20.0.1'
93+
version: '21.0.4'
94+
- distribution: graalvm
95+
os: ubuntu-latest
96+
version: '21.0.4'
8297
- distribution: dragonwell
8398
os: ubuntu-latest
8499
version: '11.0'
85100
- distribution: dragonwell
86101
os: ubuntu-latest
87102
version: '11.0.13+9'
103+
- distribution: sapmachine
104+
os: ubuntu-latest
105+
version: '17.0.7'
88106
steps:
89107
- name: Checkout
90108
uses: actions/checkout@v4
@@ -106,7 +124,8 @@ jobs:
106124
fail-fast: false
107125
matrix:
108126
os: [macos-latest, windows-latest, ubuntu-latest]
109-
distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
127+
distribution:
128+
['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
110129
exclude:
111130
- distribution: dragonwell
112131
os: macos-latest
@@ -132,7 +151,8 @@ jobs:
132151
fail-fast: false
133152
matrix:
134153
os: [macos-latest, windows-latest, ubuntu-latest]
135-
distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
154+
distribution:
155+
['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
136156
exclude:
137157
- distribution: dragonwell
138158
os: macos-latest
@@ -154,10 +174,10 @@ jobs:
154174
{
155175
$envName = "JAVA_HOME_${version}_${env:RUNNER_ARCH}"
156176
$JavaVersionPath = [Environment]::GetEnvironmentVariable($envName)
157-
if (-not (Test-Path "$JavaVersionPath")) {
177+
if (-not (Test-Path "$JavaVersionPath")) {
158178
Write-Host "$envName is not found"
159179
exit 1
160-
}
180+
}
161181
}
162182
shell: pwsh
163183
- name: Verify Java
@@ -171,7 +191,7 @@ jobs:
171191
strategy:
172192
fail-fast: false
173193
matrix:
174-
os: [macos-latest, windows-latest, ubuntu-latest]
194+
os: [macos-13, windows-latest, ubuntu-latest]
175195
version: ['17-ea', '15.0.0-ea.14']
176196
steps:
177197
- name: Checkout
@@ -208,29 +228,51 @@ jobs:
208228
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
209229
shell: bash
210230

231+
setup-java-ea-versions-sapmachine:
232+
name: sapmachine ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
233+
needs: setup-java-major-minor-versions
234+
runs-on: ${{ matrix.os }}
235+
strategy:
236+
fail-fast: false
237+
matrix:
238+
os: [macos-latest, windows-latest, ubuntu-latest]
239+
version: ['17-ea', '21-ea']
240+
steps:
241+
- name: Checkout
242+
uses: actions/checkout@v4
243+
- name: setup-java
244+
uses: ./
245+
id: setup-java
246+
with:
247+
java-version: ${{ matrix.version }}
248+
distribution: sapmachine
249+
- name: Verify Java
250+
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
251+
shell: bash
252+
211253
setup-java-custom-package-type:
212254
name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
213255
needs: setup-java-major-minor-versions
214256
runs-on: ${{ matrix.os }}
215257
strategy:
216258
fail-fast: false
217259
matrix:
218-
os: [macos-latest, windows-latest, ubuntu-latest]
219-
distribution: ['temurin', 'zulu', 'liberica', 'semeru']
260+
os: [macos-13, windows-latest, ubuntu-latest]
261+
distribution: ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine']
220262
java-package: ['jre']
221263
version: ['17.0']
222264
include:
223265
- distribution: 'zulu'
224266
java-package: jre+fx
225-
version: '8'
267+
version: '21'
226268
os: ubuntu-latest
227269
- distribution: 'zulu'
228270
java-package: jdk+fx
229-
version: '8.0.242'
271+
version: '21.0'
230272
os: ubuntu-latest
231273
- distribution: 'liberica'
232274
java-package: jdk+fx
233-
version: '8'
275+
version: '21'
234276
os: ubuntu-latest
235277
- distribution: 'liberica'
236278
java-package: jre+fx
@@ -294,10 +336,10 @@ jobs:
294336
uses: actions/checkout@v4
295337
- name: Create .java-version file
296338
shell: bash
297-
run: echo "8" > .java-version
339+
run: echo "17" > .java-version
298340
- name: Create .tool-versions file
299341
shell: bash
300-
run: echo "java 8" > .tool-versions
342+
run: echo "java 17" > .tool-versions
301343
- name: setup-java
302344
uses: ./
303345
id: setup-java
@@ -351,22 +393,22 @@ jobs:
351393
uses: actions/checkout@v4
352394
- name: Create .java-version file
353395
shell: bash
354-
run: echo "11.0.2" > .java-version
396+
run: echo "17.0.10" > .java-version
355397
- name: Create .tool-versions file
356398
shell: bash
357-
run: echo "java 11.0.2" > .tool-versions
399+
run: echo "java 17.0.10" > .tool-versions
358400
- name: setup-java
359401
uses: ./
360402
id: setup-java
361403
with:
362404
distribution: ${{ matrix.distribution }}
363405
java-version-file: ${{matrix.java-version-file }}
364406
- name: Verify Java
365-
run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}"
407+
run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}"
366408
shell: bash
367409

368410
setup-java-version-from-file-major-minor-patch-with-dist:
369-
name: ${{ matrix.distribution }} version from file 'openjdk64-11.0.2' - ${{ matrix.os }}
411+
name: ${{ matrix.distribution }} version from file 'openjdk64-17.0.10' - ${{ matrix.os }}
370412
runs-on: ${{ matrix.os }}
371413
strategy:
372414
fail-fast: false
@@ -379,16 +421,16 @@ jobs:
379421
uses: actions/checkout@v4
380422
- name: Create .java-version file
381423
shell: bash
382-
run: echo "openjdk64-11.0.2" > .java-version
424+
run: echo "openjdk64-17.0.10" > .java-version
383425
- name: Create .tool-versions file
384426
shell: bash
385-
run: echo "java openjdk64-11.0.2" > .tool-versions
427+
run: echo "java openjdk64-17.0.10" > .tool-versions
386428
- name: setup-java
387429
uses: ./
388430
id: setup-java
389431
with:
390432
distribution: ${{ matrix.distribution }}
391433
java-version-file: ${{matrix.java-version-file }}
392434
- name: Verify Java
393-
run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}"
435+
run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}"
394436
shell: bash

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Publish Immutable Action Version'
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
id-token: write
13+
packages: write
14+
15+
steps:
16+
- name: Checking out
17+
uses: actions/checkout@v4
18+
- name: Publish
19+
id: publish
20+
uses: actions/[email protected]

‎.licenses/npm/undici.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)