Skip to content

Commit 8bb0e45

Browse files
committed
Use setup-java with fixed maven wrapper caching
Fixes jruby#9526 See actions/setup-java#1095
1 parent 166ca8a commit 8bb0e45

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: remove default java except 21
2828
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
2929
- name: set up java ${{ matrix.java-version }}
30-
uses: actions/setup-java@v5
30+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
3131
with:
3232
distribution: 'zulu'
3333
java-version: ${{ matrix.java-version }}
@@ -54,7 +54,7 @@ jobs:
5454
- name: remove old java installs
5555
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
5656
- name: set up java 26
57-
uses: actions/setup-java@v5
57+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
5858
with:
5959
distribution: 'zulu'
6060
java-version: 26
@@ -82,7 +82,7 @@ jobs:
8282
- name: checkout
8383
uses: actions/checkout@v6
8484
- name: set up java ${{ matrix.java-version }}
85-
uses: actions/setup-java@v5
85+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
8686
with:
8787
distribution: 'zulu'
8888
java-version: ${{ matrix.java-version }}
@@ -105,7 +105,7 @@ jobs:
105105
- name: remove default java except 21
106106
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
107107
- name: set up java 21
108-
uses: actions/setup-java@v5
108+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
109109
with:
110110
distribution: 'zulu'
111111
java-version: 21
@@ -131,7 +131,7 @@ jobs:
131131
- name: remove default java except 21
132132
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
133133
- name: set up java 21
134-
uses: actions/setup-java@v5
134+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
135135
with:
136136
distribution: 'temurin'
137137
java-version: 21
@@ -163,7 +163,7 @@ jobs:
163163
- name: remove default java except 21
164164
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
165165
- name: set up java ${{ matrix.java-version }}
166-
uses: actions/setup-java@v5
166+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
167167
with:
168168
distribution: 'zulu'
169169
java-version: ${{ matrix.java-version }}
@@ -192,7 +192,7 @@ jobs:
192192
- name: remove default java except 21
193193
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
194194
- name: set up java ${{ matrix.java-version }}
195-
uses: actions/setup-java@v5
195+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
196196
with:
197197
distribution: 'zulu'
198198
java-version: ${{ matrix.java-version }}
@@ -224,7 +224,7 @@ jobs:
224224
- name: remove default java except 21
225225
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
226226
- name: set up java ${{ matrix.java-version }}
227-
uses: actions/setup-java@v5
227+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
228228
with:
229229
distribution: temurin
230230
java-version: ${{ matrix.java-version }}
@@ -250,7 +250,7 @@ jobs:
250250
- name: remove default java except 21
251251
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
252252
- name: set up java 21
253-
uses: actions/setup-java@v5
253+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
254254
with:
255255
distribution: 'zulu'
256256
java-version: 21
@@ -275,7 +275,7 @@ jobs:
275275
- name: checkout
276276
uses: actions/checkout@v6
277277
- name: set up java 21
278-
uses: actions/setup-java@v5
278+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
279279
with:
280280
distribution: 'zulu'
281281
java-version: 21
@@ -332,7 +332,7 @@ jobs:
332332
- name: checkout
333333
uses: actions/checkout@v6
334334
- name: set up java 21
335-
uses: actions/setup-java@v5
335+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
336336
with:
337337
distribution: 'zulu'
338338
java-version: 21
@@ -361,7 +361,7 @@ jobs:
361361
- name: checkout
362362
uses: actions/checkout@v6
363363
- name: set up java 21
364-
uses: actions/setup-java@v5
364+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
365365
with:
366366
distribution: 'zulu'
367367
java-version: 21
@@ -391,7 +391,7 @@ jobs:
391391
- name: checkout
392392
uses: actions/checkout@v3
393393
- name: set up java 21
394-
uses: actions/setup-java@v5
394+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
395395
with:
396396
distribution: 'zulu'
397397
java-version: 21
@@ -424,7 +424,7 @@ jobs:
424424
- name: checkout
425425
uses: actions/checkout@v3
426426
- name: set up java 21
427-
uses: actions/setup-java@v5
427+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
428428
with:
429429
distribution: 'zulu'
430430
java-version: 21
@@ -454,7 +454,7 @@ jobs:
454454
- name: remove default java except 21
455455
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
456456
- name: set up java 21
457-
uses: actions/setup-java@v5
457+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
458458
with:
459459
distribution: 'zulu'
460460
java-version: '21'
@@ -474,7 +474,7 @@ jobs:
474474
- name: remove default java except 21
475475
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
476476
- name: set up java 21
477-
uses: actions/setup-java@v5
477+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
478478
with:
479479
distribution: 'zulu'
480480
java-version: 21
@@ -515,7 +515,7 @@ jobs:
515515
- name: remove default java except 21
516516
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
517517
- name: set up java 21
518-
uses: actions/setup-java@v5
518+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
519519
with:
520520
distribution: 'temurin'
521521
java-version: 21
@@ -536,7 +536,7 @@ jobs:
536536
- name: remove default java except 21
537537
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
538538
- name: set up java 21
539-
uses: actions/setup-java@v5
539+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
540540
with:
541541
distribution: 'temurin'
542542
java-version: 21
@@ -564,7 +564,7 @@ jobs:
564564
# - name: checkout
565565
# uses: actions/checkout@v6
566566
# - name: set up java ${{ matrix.java-version }}
567-
# uses: actions/setup-java@v5
567+
# uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
568568
# with:
569569
# distribution: 'zulu'
570570
# java-version: ${{ matrix.java-version }}
@@ -593,7 +593,7 @@ jobs:
593593
# with:
594594
# java-version: 21
595595
# - name: set up java ${{ matrix.java-version }}
596-
# uses: actions/setup-java@v5
596+
# uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
597597
# with:
598598
# distribution: 'zulu'
599599
# java-version: ${{ matrix.java-version }}
@@ -614,7 +614,7 @@ jobs:
614614
- name: remove default java except 21
615615
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
616616
- name: set up java ${{ matrix.java-version }}
617-
uses: actions/setup-java@v5
617+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
618618
with:
619619
distribution: 'semeru'
620620
java-version: '21'

‎.github/workflows/dist-verification-ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: checkout
3232
uses: actions/checkout@v6
3333
- name: set up java 21
34-
uses: actions/setup-java@v5
34+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
3535
with:
3636
distribution: 'temurin'
3737
java-version: 21
@@ -83,7 +83,7 @@ jobs:
8383
- name: checkout
8484
uses: actions/checkout@v6
8585
- name: set up java 21
86-
uses: actions/setup-java@v5
86+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
8787
with:
8888
distribution: 'temurin'
8989
java-version: 21
@@ -138,7 +138,7 @@ jobs:
138138
with:
139139
path: jruby-src
140140
- name: set up java ${{ matrix.java-version }}
141-
uses: actions/setup-java@v5
141+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
142142
with:
143143
distribution: 'temurin'
144144
java-version: ${{ matrix.java-version }}
@@ -173,7 +173,7 @@ jobs:
173173

174174
steps:
175175
- name: set up java ${{ matrix.java-version }}
176-
uses: actions/setup-java@v5
176+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
177177
with:
178178
distribution: 'temurin'
179179
java-version: ${{ matrix.java-version }}
@@ -205,7 +205,7 @@ jobs:
205205

206206
steps:
207207
- name: set up java ${{ matrix.java-version }}
208-
uses: actions/setup-java@v5
208+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
209209
with:
210210
distribution: 'temurin'
211211
java-version: ${{ matrix.java-version }}
@@ -232,7 +232,7 @@ jobs:
232232

233233
steps:
234234
- name: set up java ${{ matrix.java-version }}
235-
uses: actions/setup-java@v5
235+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
236236
with:
237237
distribution: 'temurin'
238238
java-version: ${{ matrix.java-version }}
@@ -269,7 +269,7 @@ jobs:
269269

270270
steps:
271271
- name: set up java (x64, ${{ matrix.java-version }})
272-
uses: actions/setup-java@v5
272+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
273273
with:
274274
architecture: x64
275275
distribution: 'temurin'
@@ -285,7 +285,7 @@ jobs:
285285
run: installed_jruby\bin\jruby -e "puts 'hello'"
286286

287287
# - name: set up java (x86, ${{ matrix.java-version }})
288-
# uses: actions/setup-java@v5
288+
# uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
289289
# with:
290290
# architecture: x86
291291
# distribution: 'temurin'

‎.github/workflows/snapshot-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: checkout
2626
uses: actions/checkout@v6
2727
- name: set up Java
28-
uses: actions/setup-java@v5
28+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95
2929
with:
3030
distribution: 'zulu'
3131
java-version: ${{ inputs.javaLevel }}

0 commit comments

Comments
 (0)