Skip to content

Commit 45d91f9

Browse files
committed
Bump Ubuntu to 24.04 globally
1 parent 7547d35 commit 45d91f9

File tree

6 files changed

+39
-30
lines changed

6 files changed

+39
-30
lines changed

.github/workflows/ci.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ jobs:
340340
native-linux-tests-5:
341341
needs: generate-linux-launcher
342342
timeout-minutes: 120
343-
runs-on: "ubuntu-20.04"
343+
runs-on: ubuntu-24.04
344344
steps:
345345
- uses: actions/checkout@v4
346346
with:
@@ -1033,7 +1033,7 @@ jobs:
10331033

10341034
generate-mostly-static-launcher:
10351035
timeout-minutes: 120
1036-
runs-on: ubuntu-20.04
1036+
runs-on: ubuntu-24.04
10371037
steps:
10381038
- uses: actions/checkout@v4
10391039
with:
@@ -1057,7 +1057,7 @@ jobs:
10571057
native-mostly-static-tests-1:
10581058
needs: generate-mostly-static-launcher
10591059
timeout-minutes: 120
1060-
runs-on: ubuntu-20.04
1060+
runs-on: ubuntu-24.04
10611061
steps:
10621062
- uses: actions/checkout@v4
10631063
with:
@@ -1104,7 +1104,7 @@ jobs:
11041104
native-mostly-static-tests-2:
11051105
needs: generate-mostly-static-launcher
11061106
timeout-minutes: 120
1107-
runs-on: ubuntu-20.04
1107+
runs-on: ubuntu-24.04
11081108
steps:
11091109
- uses: actions/checkout@v4
11101110
with:
@@ -1137,7 +1137,7 @@ jobs:
11371137
native-mostly-static-tests-3:
11381138
needs: generate-mostly-static-launcher
11391139
timeout-minutes: 120
1140-
runs-on: ubuntu-20.04
1140+
runs-on: ubuntu-24.04
11411141
steps:
11421142
- uses: actions/checkout@v4
11431143
with:
@@ -1170,7 +1170,7 @@ jobs:
11701170
native-mostly-static-tests-4:
11711171
needs: generate-mostly-static-launcher
11721172
timeout-minutes: 120
1173-
runs-on: ubuntu-20.04
1173+
runs-on: ubuntu-24.04
11741174
steps:
11751175
- uses: actions/checkout@v4
11761176
with:
@@ -1203,7 +1203,7 @@ jobs:
12031203
native-mostly-static-tests-5:
12041204
needs: generate-mostly-static-launcher
12051205
timeout-minutes: 120
1206-
runs-on: ubuntu-20.04
1206+
runs-on: ubuntu-24.04
12071207
steps:
12081208
- uses: actions/checkout@v4
12091209
with:
@@ -1236,7 +1236,7 @@ jobs:
12361236

12371237
generate-static-launcher:
12381238
timeout-minutes: 120
1239-
runs-on: ubuntu-20.04
1239+
runs-on: ubuntu-24.04
12401240
steps:
12411241
- uses: actions/checkout@v4
12421242
with:
@@ -1260,7 +1260,7 @@ jobs:
12601260
native-static-tests-1:
12611261
needs: generate-static-launcher
12621262
timeout-minutes: 120
1263-
runs-on: ubuntu-20.04
1263+
runs-on: ubuntu-24.04
12641264
steps:
12651265
- uses: actions/checkout@v4
12661266
with:
@@ -1307,7 +1307,7 @@ jobs:
13071307
native-static-tests-2:
13081308
needs: generate-static-launcher
13091309
timeout-minutes: 120
1310-
runs-on: ubuntu-20.04
1310+
runs-on: ubuntu-24.04
13111311
steps:
13121312
- uses: actions/checkout@v4
13131313
with:
@@ -1342,7 +1342,7 @@ jobs:
13421342
native-static-tests-3:
13431343
needs: generate-static-launcher
13441344
timeout-minutes: 120
1345-
runs-on: ubuntu-20.04
1345+
runs-on: ubuntu-24.04
13461346
steps:
13471347
- uses: actions/checkout@v4
13481348
with:
@@ -1377,7 +1377,7 @@ jobs:
13771377
native-static-tests-4:
13781378
needs: generate-static-launcher
13791379
timeout-minutes: 120
1380-
runs-on: ubuntu-20.04
1380+
runs-on: ubuntu-24.04
13811381
steps:
13821382
- uses: actions/checkout@v4
13831383
with:
@@ -1412,7 +1412,7 @@ jobs:
14121412
native-static-tests-5:
14131413
needs: generate-static-launcher
14141414
timeout-minutes: 120
1415-
runs-on: ubuntu-20.04
1415+
runs-on: ubuntu-24.04
14161416
steps:
14171417
- uses: actions/checkout@v4
14181418
with:
@@ -1446,7 +1446,7 @@ jobs:
14461446

14471447
docs-tests:
14481448
# for now, let's run those tests only on ubuntu
1449-
runs-on: ubuntu-20.04
1449+
runs-on: ubuntu-24.04
14501450
steps:
14511451
- uses: actions/checkout@v4
14521452
with:
@@ -1474,7 +1474,7 @@ jobs:
14741474

14751475
checks:
14761476
timeout-minutes: 30
1477-
runs-on: ubuntu-20.04
1477+
runs-on: ubuntu-24.04
14781478
steps:
14791479
- uses: actions/checkout@v4
14801480
with:
@@ -1499,7 +1499,7 @@ jobs:
14991499
15001500
format:
15011501
timeout-minutes: 15
1502-
runs-on: ubuntu-20.04
1502+
runs-on: ubuntu-24.04
15031503
steps:
15041504
- uses: actions/checkout@v4
15051505
with:
@@ -1513,7 +1513,7 @@ jobs:
15131513

15141514
reference-doc:
15151515
timeout-minutes: 15
1516-
runs-on: ubuntu-20.04
1516+
runs-on: ubuntu-24.04
15171517
steps:
15181518
- uses: actions/checkout@v4
15191519
with:
@@ -1533,7 +1533,7 @@ jobs:
15331533
15341534
bloop-memory-footprint:
15351535
timeout-minutes: 120
1536-
runs-on: ubuntu-20.04
1536+
runs-on: ubuntu-24.04
15371537
steps:
15381538
- uses: actions/checkout@v4
15391539
with:
@@ -1555,7 +1555,7 @@ jobs:
15551555

15561556
test-hypothetical-sbt-export:
15571557
timeout-minutes: 120
1558-
runs-on: "ubuntu-20.04"
1558+
runs-on: ubuntu-24.04
15591559
steps:
15601560
- uses: actions/checkout@v4
15611561
with:
@@ -1631,7 +1631,7 @@ jobs:
16311631
- reference-doc
16321632
- docs-tests
16331633
if: github.event_name == 'push' && github.repository == 'VirtusLab/scala-cli'
1634-
runs-on: ubuntu-20.04
1634+
runs-on: ubuntu-24.04
16351635
steps:
16361636
- uses: actions/checkout@v4
16371637
with:
@@ -1711,7 +1711,7 @@ jobs:
17111711
- generate-linux-arm64-native-launcher
17121712
- publish
17131713
if: github.event_name == 'push'
1714-
runs-on: ubuntu-20.04
1714+
runs-on: ubuntu-24.04
17151715
steps:
17161716
- uses: actions/checkout@v4
17171717
with:
@@ -1776,7 +1776,7 @@ jobs:
17761776
needs:
17771777
- launchers
17781778
- publish
1779-
runs-on: ubuntu-20.04
1779+
runs-on: ubuntu-24.04
17801780
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'VirtusLab/scala-cli'
17811781
steps:
17821782
- uses: actions/checkout@v4

.github/workflows/github-dependency-graph.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
submit-dependency-graph:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v4
1313
- uses: coursier/cache-action@v6

.github/workflows/test-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
actions: write
1313
jobs:
1414
report:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- uses: dorny/test-reporter@v1
1818
with:

.github/workflows/website.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
update-website:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:

project/deps.sc

+3-1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ def csDockerVersion = Deps.Versions.coursierCli
276276
def buildCsVersion = Deps.Versions.coursierCli
277277
def buildCsM1Version = Deps.Versions.coursierM1Cli
278278

279+
def ubuntuDockerVersion = "24.04"
280+
279281
// Native library used to encrypt GitHub secrets
280282
def libsodiumVersion = "1.0.18"
281283
// Using the libsodium static library from this Alpine version (in the static launcher)
@@ -286,7 +288,7 @@ object Docker {
286288
def muslBuilder =
287289
s"$customMuslBuilderImageName:latest"
288290

289-
def testImage = "ubuntu:18.04"
291+
def testImage = s"ubuntu:$ubuntuDockerVersion"
290292
def alpineTestImage =
291293
"alpine@sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454"
292294
def authProxyTestImage =

project/settings.sc

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
import $ivy.`com.goyeau::mill-scalafix::0.3.1`
22
import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.29`
33

4-
import $file.deps,
5-
deps.{Deps, Docker, alpineVersion, buildCsVersion, buildCsM1Version, libsodiumVersion}
4+
import $file.deps, deps.{
5+
Deps,
6+
Docker,
7+
alpineVersion,
8+
buildCsVersion,
9+
buildCsM1Version,
10+
libsodiumVersion,
11+
ubuntuDockerVersion
12+
}
613
import $file.utils, utils.isArmArchitecture
714

815
import com.goyeau.mill.scalafix.ScalafixModule
@@ -305,7 +312,7 @@ trait CliLaunchers extends SbtModule { self =>
305312
def launcherKind = `base-image`.launcherKind
306313
def nativeImageDockerParams = Some(
307314
NativeImage.DockerParams(
308-
imageName = "ubuntu:18.04",
315+
imageName = s"ubuntu:$ubuntuDockerVersion",
309316
prepareCommand =
310317
maybePassNativeImageJpmsOption +
311318
"""apt-get update -q -y &&\
@@ -366,7 +373,7 @@ trait CliLaunchers extends SbtModule { self =>
366373
def launcherKind = "mostly-static"
367374
def nativeImageDockerParams = T {
368375
val baseDockerParams = NativeImage.linuxMostlyStaticParams(
369-
"ubuntu:18.04", // TODO Pin that
376+
s"ubuntu:$ubuntuDockerVersion",
370377
s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz"
371378
)
372379
val dockerParams = setupLocaleAndOptions(baseDockerParams)

0 commit comments

Comments
 (0)