Skip to content

Commit 95f21d2

Browse files
authored
Merge branch 'actions:main' into feat/669/support_sdkmanrc
2 parents d6f9a13 + 46c56d6 commit 95f21d2

File tree

10 files changed

+1465
-422
lines changed

10 files changed

+1465
-422
lines changed

.github/workflows/e2e-cache.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [macos-13, windows-latest, ubuntu-latest]
24+
os: [macos-15-intel, windows-latest, ubuntu-latest]
2525
steps:
2626
- name: Checkout
2727
uses: actions/checkout@v5
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
os: [macos-13, windows-latest, ubuntu-latest]
49+
os: [macos-15-intel, 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-13, windows-latest, ubuntu-latest]
73+
os: [macos-15-intel, windows-latest, ubuntu-latest]
7474
steps:
7575
- name: Checkout
7676
uses: actions/checkout@v5
@@ -93,7 +93,7 @@ jobs:
9393
strategy:
9494
fail-fast: false
9595
matrix:
96-
os: [macos-13, windows-latest, ubuntu-latest]
96+
os: [macos-15-intel, 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-13, windows-latest, ubuntu-22.04]
124+
os: [macos-15-intel, windows-latest, ubuntu-22.04]
125125
steps:
126126
- name: Checkout
127127
uses: actions/checkout@v5
@@ -133,15 +133,15 @@ jobs:
133133
java-version: '11'
134134
cache: sbt
135135
- name: Setup SBT
136-
if: matrix.os == 'macos-13'
136+
if: matrix.os == 'macos-15-intel'
137137
run: |
138138
echo ""Installing SBT...""
139139
brew install sbt
140140
- name: Create files to cache
141141
run: sbt update
142142

143143
- name: Check files to cache on macos-latest
144-
if: matrix.os == 'macos-13'
144+
if: matrix.os == 'macos-15-intel'
145145
run: |
146146
if [ ! -d ~/Library/Caches/Coursier ]; then
147147
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
@@ -170,7 +170,7 @@ jobs:
170170
strategy:
171171
fail-fast: false
172172
matrix:
173-
os: [macos-13, windows-latest, ubuntu-22.04]
173+
os: [macos-15-intel, windows-latest, ubuntu-22.04]
174174
needs: sbt-save
175175
steps:
176176
- name: Checkout
@@ -184,7 +184,7 @@ jobs:
184184
cache: sbt
185185

186186
- name: Confirm that ~/Library/Caches/Coursier directory has been made
187-
if: matrix.os == 'macos-13'
187+
if: matrix.os == 'macos-15-intel'
188188
run: |
189189
if [ ! -d ~/Library/Caches/Coursier ]; then
190190
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"

.github/workflows/e2e-versions.yml

Lines changed: 5 additions & 5 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-13, windows-latest, ubuntu-latest]
23+
os: [macos-15-intel, windows-latest, ubuntu-latest]
2424
distribution: [
2525
'temurin',
2626
'adopt',
@@ -39,7 +39,7 @@ jobs:
3939
- distribution: microsoft
4040
version: 8
4141
- distribution: dragonwell
42-
os: macos-13
42+
os: macos-15-intel
4343
include:
4444
- distribution: microsoft
4545
os: windows-latest
@@ -51,7 +51,7 @@ jobs:
5151
os: macos-latest
5252
version: 25
5353
- distribution: oracle
54-
os: macos-13
54+
os: macos-15-intel
5555
version: 17
5656
- distribution: oracle
5757
os: windows-latest
@@ -229,7 +229,7 @@ jobs:
229229
strategy:
230230
fail-fast: false
231231
matrix:
232-
os: [macos-13, windows-latest, ubuntu-latest]
232+
os: [macos-15-intel, windows-latest, ubuntu-latest]
233233
version: ['17-ea', '15.0.0-ea.14']
234234
steps:
235235
- name: Checkout
@@ -295,7 +295,7 @@ jobs:
295295
strategy:
296296
fail-fast: false
297297
matrix:
298-
os: [macos-13, windows-latest, ubuntu-latest]
298+
os: [macos-15-intel, windows-latest, ubuntu-latest]
299299
distribution:
300300
['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine', 'jetbrains']
301301
java-package: ['jre']

0 commit comments

Comments
 (0)