Skip to content

Commit d324810

Browse files
micossowmicossow
authored
GH Actions - switch to Ubuntu 24.04 (#1120)
* GH Actions - switch to Ubuntu 24.04 * GH Actions - switch to setup-java@v4 * GH Actions - add setup-sbt@v1
1 parent 50810c9 commit d324810

File tree

2 files changed

+47
-26
lines changed

2 files changed

+47
-26
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,22 @@ jobs:
1212
github.event_name == 'push' ||
1313
github.event.pull_request.head.repo.full_name != github.repository ||
1414
github.event.pull_request.user.login == 'softwaremill-ci'
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616
env:
1717
scala: 2.12
1818
steps:
1919
- name: Check-out repository
2020
id: repo-checkout
2121
uses: actions/checkout@v2
2222

23+
- name: Set up SBT
24+
uses: sbt/setup-sbt@v1
25+
2326
- name: Set up JDK
24-
uses: actions/setup-java@v2
27+
uses: actions/setup-java@v4
2528
with:
2629
distribution: 'temurin'
27-
java-version: 8
30+
java-version: '8'
2831

2932
- uses: actions/setup-node@v3
3033
with:
@@ -51,19 +54,22 @@ jobs:
5154
github.event_name == 'push' ||
5255
github.event.pull_request.head.repo.full_name != github.repository ||
5356
github.event.pull_request.user.login == 'softwaremill-ci'
54-
runs-on: ubuntu-20.04
57+
runs-on: ubuntu-24.04
5558
env:
5659
scala: 2.13
5760
steps:
5861
- name: Check-out repository
5962
id: repo-checkout
6063
uses: actions/checkout@v2
6164

65+
- name: Set up SBT
66+
uses: sbt/setup-sbt@v1
67+
6268
- name: Set up JDK
63-
uses: actions/setup-java@v2
69+
uses: actions/setup-java@v4
6470
with:
6571
distribution: 'temurin'
66-
java-version: 8
72+
java-version: '8'
6773

6874
- uses: actions/setup-node@v3
6975
with:
@@ -90,19 +96,22 @@ jobs:
9096
github.event_name == 'push' ||
9197
github.event.pull_request.head.repo.full_name != github.repository ||
9298
github.event.pull_request.user.login == 'softwaremill-ci'
93-
runs-on: ubuntu-20.04
99+
runs-on: ubuntu-24.04
94100
env:
95101
scala: 3
96102
steps:
97103
- name: Check-out repository
98104
id: repo-checkout
99105
uses: actions/checkout@v2
100106

107+
- name: Set up SBT
108+
uses: sbt/setup-sbt@v1
109+
101110
- name: Set up JDK
102-
uses: actions/setup-java@v2
111+
uses: actions/setup-java@v4
103112
with:
104113
distribution: 'temurin'
105-
java-version: 8
114+
java-version: '8'
106115

107116
- uses: actions/setup-node@v3
108117
with:
@@ -129,19 +138,22 @@ jobs:
129138
github.event_name == 'push' ||
130139
github.event.pull_request.head.repo.full_name != github.repository ||
131140
github.event.pull_request.user.login == 'softwaremill-ci'
132-
runs-on: ubuntu-20.04
141+
runs-on: ubuntu-24.04
133142
env:
134143
scala: 2.13
135144
steps:
136145
- name: Check-out repository
137146
id: repo-checkout
138147
uses: actions/checkout@v2
139148

149+
- name: Set up SBT
150+
uses: sbt/setup-sbt@v1
151+
140152
- name: Set up JDK
141-
uses: actions/setup-java@v2
153+
uses: actions/setup-java@v4
142154
with:
143155
distribution: 'temurin'
144-
java-version: 11
156+
java-version: '11'
145157

146158
- uses: actions/setup-node@v3
147159
with:
@@ -195,19 +207,22 @@ jobs:
195207
github.event_name == 'push' ||
196208
github.event.pull_request.head.repo.full_name != github.repository ||
197209
github.event.pull_request.user.login == 'softwaremill-ci'
198-
runs-on: ubuntu-20.04
210+
runs-on: ubuntu-24.04
199211
env:
200212
scala: 2.13
201213
steps:
202214
- name: Check-out repository
203215
id: repo-checkout
204216
uses: actions/checkout@v2
205217

218+
- name: Set up SBT
219+
uses: sbt/setup-sbt@v1
220+
206221
- name: Set up JDK
207-
uses: actions/setup-java@v2
222+
uses: actions/setup-java@v4
208223
with:
209224
distribution: 'temurin'
210-
java-version: 11
225+
java-version: '11'
211226

212227
- uses: actions/setup-node@v3
213228
with:
@@ -235,16 +250,19 @@ jobs:
235250
publish-jar:
236251
needs: [ci-2-12, ci-2-13, ci-3, ci-docker, ci-native-image-agent-config-verification]
237252
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
238-
runs-on: ubuntu-20.04
253+
runs-on: ubuntu-24.04
239254
steps:
240255
- name: Checkout
241256
uses: actions/checkout@v2
242257

258+
- name: Set up SBT
259+
uses: sbt/setup-sbt@v1
260+
243261
- name: Set up JDK
244-
uses: actions/setup-java@v2
262+
uses: actions/setup-java@v4
245263
with:
246264
distribution: 'temurin'
247-
java-version: 8
265+
java-version: '8'
248266

249267
- uses: actions/setup-node@v3
250268
with:
@@ -305,16 +323,19 @@ jobs:
305323
publish-docker:
306324
needs: [ci-2-12, ci-2-13, ci-3, ci-docker, ci-native-image-agent-config-verification]
307325
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
308-
runs-on: ubuntu-20.04
326+
runs-on: ubuntu-24.04
309327
steps:
310328
- name: Checkout
311329
uses: actions/checkout@v2
312330

331+
- name: Set up SBT
332+
uses: sbt/setup-sbt@v1
333+
313334
- name: Set up JDK
314-
uses: actions/setup-java@v2
335+
uses: actions/setup-java@v4
315336
with:
316337
distribution: 'temurin'
317-
java-version: 11
338+
java-version: '11'
318339

319340
- uses: actions/setup-node@v3
320341
with:
@@ -347,7 +368,7 @@ jobs:
347368
name: Attach automerge label
348369
# only for PRs by softwaremill-ci
349370
if: github.event.pull_request.user.login == 'softwaremill-ci'
350-
runs-on: ubuntu-20.04
371+
runs-on: ubuntu-24.04
351372
steps:
352373
- uses: actions/checkout@v3
353374
with:
@@ -370,7 +391,7 @@ jobs:
370391
# only for PRs by softwaremill-ci
371392
if: github.event.pull_request.user.login == 'softwaremill-ci'
372393
needs: [ci-2-12, ci-2-13, ci-3, ci-docker, ci-native-image-agent-config-verification, label]
373-
runs-on: ubuntu-20.04
394+
runs-on: ubuntu-24.04
374395
steps:
375396
- id: automerge
376397
name: automerge

‎.github/workflows/scala-steward.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88

99
jobs:
1010
scala-steward:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3
1515
- name: Set up JDK 11
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: 11
19+
java-version: '11'
2020
cache: 'sbt'
2121
- name: Launch Scala Steward
2222
uses: scala-steward-org/scala-steward-action@v2

0 commit comments

Comments
 (0)