Skip to content

Commit 2e74cbc

Browse files
HarithaVattikutiHarithaVattikuti
authored
Fix versions check failures (#634)
* fix macos latest failures * fix failures
1 parent a1c6c9c commit 2e74cbc

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎.github/workflows/e2e-cache.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [macos-latest, windows-latest, ubuntu-latest]
24+
os: [macos-13, windows-latest, ubuntu-latest]
2525
steps:
2626
- name: Checkout
2727
uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
os: [macos-latest, windows-latest, ubuntu-latest]
49+
os: [macos-13, windows-latest, ubuntu-latest]
5050
needs: gradle-save
5151
steps:
5252
- name: Checkout
@@ -70,7 +70,7 @@ jobs:
7070
strategy:
7171
fail-fast: false
7272
matrix:
73-
os: [macos-latest, windows-latest, ubuntu-latest]
73+
os: [macos-13, windows-latest, ubuntu-latest]
7474
steps:
7575
- name: Checkout
7676
uses: actions/checkout@v4
@@ -93,7 +93,7 @@ jobs:
9393
strategy:
9494
fail-fast: false
9595
matrix:
96-
os: [macos-latest, windows-latest, ubuntu-latest]
96+
os: [macos-13, windows-latest, ubuntu-latest]
9797
needs: maven-save
9898
steps:
9999
- name: Checkout
@@ -121,7 +121,7 @@ jobs:
121121
strategy:
122122
fail-fast: false
123123
matrix:
124-
os: [macos-latest, windows-latest, ubuntu-latest]
124+
os: [macos-13, windows-latest, ubuntu-latest]
125125
steps:
126126
- name: Checkout
127127
uses: actions/checkout@v4
@@ -132,33 +132,35 @@ jobs:
132132
distribution: 'adopt'
133133
java-version: '11'
134134
cache: sbt
135+
- name: Setup SBT
136+
if: matrix.os == 'macos-13'
137+
run: |
138+
echo ""Installing SBT...""
139+
brew install sbt
135140
- name: Create files to cache
136141
run: sbt update
137142

138143
- name: Check files to cache on macos-latest
139-
if: matrix.os == 'macos-latest'
144+
if: matrix.os == 'macos-13'
140145
run: |
141146
if [ ! -d ~/Library/Caches/Coursier ]; then
142147
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
143148
exit 1
144149
fi
145-
146150
- name: Check files to cache on windows-latest
147151
if: matrix.os == 'windows-latest'
148152
run: |
149153
if [ ! -d ~/AppData/Local/Coursier/Cache ]; then
150154
echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly"
151155
exit 1
152156
fi
153-
154157
- name: Check files to cache on ubuntu-latest
155158
if: matrix.os == 'ubuntu-latest'
156159
run: |
157160
if [ ! -d ~/.cache/coursier ]; then
158161
echo "::error::The ~/.cache/coursier directory does not exist unexpectedly"
159162
exit 1
160163
fi
161-
162164
sbt-restore:
163165
runs-on: ${{ matrix.os }}
164166
defaults:
@@ -168,7 +170,7 @@ jobs:
168170
strategy:
169171
fail-fast: false
170172
matrix:
171-
os: [macos-latest, windows-latest, ubuntu-latest]
173+
os: [macos-13, windows-latest, ubuntu-latest]
172174
needs: sbt-save
173175
steps:
174176
- name: Checkout
@@ -182,14 +184,13 @@ jobs:
182184
cache: sbt
183185

184186
- name: Confirm that ~/Library/Caches/Coursier directory has been made
185-
if: matrix.os == 'macos-latest'
187+
if: matrix.os == 'macos-13'
186188
run: |
187189
if [ ! -d ~/Library/Caches/Coursier ]; then
188190
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
189191
exit 1
190192
fi
191193
ls ~/Library/Caches/Coursier
192-
193194
- name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made
194195
if: matrix.os == 'windows-latest'
195196
run: |
@@ -198,7 +199,6 @@ jobs:
198199
exit 1
199200
fi
200201
ls ~/AppData/Local/Coursier/Cache
201-
202202
- name: Confirm that ~/.cache/coursier directory has been made
203203
if: matrix.os == 'ubuntu-latest'
204204
run: |

‎.github/workflows/e2e-versions.yml

+19-19
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',
@@ -32,15 +32,15 @@ jobs:
3232
'corretto',
3333
'dragonwell'
3434
] # internally 'adopt-hotspot' is the same as 'adopt'
35-
version: ['8', '11', '17']
35+
version: ['21', '11', '17']
3636
exclude:
3737
- distribution: microsoft
3838
version: 8
3939
- distribution: dragonwell
40-
os: macos-latest
40+
os: macos-13
4141
include:
4242
- distribution: oracle
43-
os: macos-latest
43+
os: macos-13
4444
version: 17
4545
- distribution: oracle
4646
os: windows-latest
@@ -73,7 +73,7 @@ jobs:
7373
distribution: ['temurin', 'zulu', 'liberica']
7474
version:
7575
- '11.0'
76-
- '8.0.302'
76+
- '21.0'
7777
- '17.0.7+7'
7878
include:
7979
- distribution: oracle
@@ -171,7 +171,7 @@ jobs:
171171
strategy:
172172
fail-fast: false
173173
matrix:
174-
os: [macos-latest, windows-latest, ubuntu-latest]
174+
os: [macos-13, windows-latest, ubuntu-latest]
175175
version: ['17-ea', '15.0.0-ea.14']
176176
steps:
177177
- name: Checkout
@@ -215,22 +215,22 @@ jobs:
215215
strategy:
216216
fail-fast: false
217217
matrix:
218-
os: [macos-latest, windows-latest, ubuntu-latest]
218+
os: [macos-13, windows-latest, ubuntu-latest]
219219
distribution: ['temurin', 'zulu', 'liberica', 'semeru']
220220
java-package: ['jre']
221221
version: ['17.0']
222222
include:
223223
- distribution: 'zulu'
224224
java-package: jre+fx
225-
version: '8'
225+
version: '21'
226226
os: ubuntu-latest
227227
- distribution: 'zulu'
228228
java-package: jdk+fx
229-
version: '8.0.242'
229+
version: '21.0'
230230
os: ubuntu-latest
231231
- distribution: 'liberica'
232232
java-package: jdk+fx
233-
version: '8'
233+
version: '21'
234234
os: ubuntu-latest
235235
- distribution: 'liberica'
236236
java-package: jre+fx
@@ -294,10 +294,10 @@ jobs:
294294
uses: actions/checkout@v4
295295
- name: Create .java-version file
296296
shell: bash
297-
run: echo "8" > .java-version
297+
run: echo "17" > .java-version
298298
- name: Create .tool-versions file
299299
shell: bash
300-
run: echo "java 8" > .tool-versions
300+
run: echo "java 17" > .tool-versions
301301
- name: setup-java
302302
uses: ./
303303
id: setup-java
@@ -351,22 +351,22 @@ jobs:
351351
uses: actions/checkout@v4
352352
- name: Create .java-version file
353353
shell: bash
354-
run: echo "11.0.2" > .java-version
354+
run: echo "17.0.10" > .java-version
355355
- name: Create .tool-versions file
356356
shell: bash
357-
run: echo "java 11.0.2" > .tool-versions
357+
run: echo "java 17.0.10" > .tool-versions
358358
- name: setup-java
359359
uses: ./
360360
id: setup-java
361361
with:
362362
distribution: ${{ matrix.distribution }}
363363
java-version-file: ${{matrix.java-version-file }}
364364
- name: Verify Java
365-
run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}"
365+
run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}"
366366
shell: bash
367367

368368
setup-java-version-from-file-major-minor-patch-with-dist:
369-
name: ${{ matrix.distribution }} version from file 'openjdk64-11.0.2' - ${{ matrix.os }}
369+
name: ${{ matrix.distribution }} version from file 'openjdk64-17.0.10' - ${{ matrix.os }}
370370
runs-on: ${{ matrix.os }}
371371
strategy:
372372
fail-fast: false
@@ -379,16 +379,16 @@ jobs:
379379
uses: actions/checkout@v4
380380
- name: Create .java-version file
381381
shell: bash
382-
run: echo "openjdk64-11.0.2" > .java-version
382+
run: echo "openjdk64-17.0.10" > .java-version
383383
- name: Create .tool-versions file
384384
shell: bash
385-
run: echo "java openjdk64-11.0.2" > .tool-versions
385+
run: echo "java openjdk64-17.0.10" > .tool-versions
386386
- name: setup-java
387387
uses: ./
388388
id: setup-java
389389
with:
390390
distribution: ${{ matrix.distribution }}
391391
java-version-file: ${{matrix.java-version-file }}
392392
- name: Verify Java
393-
run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}"
393+
run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}"
394394
shell: bash

0 commit comments

Comments
 (0)