Skip to content

Commit 341cff2

Browse files
GedochaoGedochao
authored
Merge pull request VirtusLab#3528 from Gedochao/update/ubuntu-24.04
Bump `scala-packager` to 0.1.32 & linux CI runners to `ubuntu-24.04`
2 parents 4511fce + e17c304 commit 341cff2

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎.github/workflows/ci.yml

+33-33
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
jobs:
1616
unit-tests:
1717
timeout-minutes: 120
18-
runs-on: "ubuntu-20.04"
18+
runs-on: ubuntu-24.04
1919
steps:
2020
- uses: actions/checkout@v4
2121
with:
@@ -53,7 +53,7 @@ jobs:
5353

5454
jvm-tests-1:
5555
timeout-minutes: 120
56-
runs-on: "ubuntu-20.04"
56+
runs-on: ubuntu-24.04
5757
steps:
5858
- uses: actions/checkout@v4
5959
with:
@@ -81,7 +81,7 @@ jobs:
8181

8282
jvm-tests-2:
8383
timeout-minutes: 120
84-
runs-on: "ubuntu-20.04"
84+
runs-on: ubuntu-24.04
8585
steps:
8686
- uses: actions/checkout@v4
8787
with:
@@ -106,7 +106,7 @@ jobs:
106106

107107
jvm-tests-3:
108108
timeout-minutes: 120
109-
runs-on: "ubuntu-20.04"
109+
runs-on: ubuntu-24.04
110110
steps:
111111
- uses: actions/checkout@v4
112112
with:
@@ -131,7 +131,7 @@ jobs:
131131

132132
jvm-tests-4:
133133
timeout-minutes: 120
134-
runs-on: "ubuntu-20.04"
134+
runs-on: ubuntu-24.04
135135
steps:
136136
- uses: actions/checkout@v4
137137
with:
@@ -156,7 +156,7 @@ jobs:
156156

157157
jvm-tests-5:
158158
timeout-minutes: 120
159-
runs-on: "ubuntu-20.04"
159+
runs-on: ubuntu-24.04
160160
steps:
161161
- uses: actions/checkout@v4
162162
with:
@@ -181,7 +181,7 @@ jobs:
181181

182182
generate-linux-launcher:
183183
timeout-minutes: 120
184-
runs-on: "ubuntu-20.04"
184+
runs-on: ubuntu-24.04
185185
steps:
186186
- uses: actions/checkout@v4
187187
with:
@@ -208,7 +208,7 @@ jobs:
208208
native-linux-tests-1:
209209
needs: generate-linux-launcher
210210
timeout-minutes: 120
211-
runs-on: "ubuntu-20.04"
211+
runs-on: ubuntu-24.04
212212
steps:
213213
- uses: actions/checkout@v4
214214
with:
@@ -241,7 +241,7 @@ jobs:
241241
native-linux-tests-2:
242242
needs: generate-linux-launcher
243243
timeout-minutes: 120
244-
runs-on: "ubuntu-20.04"
244+
runs-on: ubuntu-24.04
245245
steps:
246246
- uses: actions/checkout@v4
247247
with:
@@ -274,7 +274,7 @@ jobs:
274274
native-linux-tests-3:
275275
needs: generate-linux-launcher
276276
timeout-minutes: 120
277-
runs-on: "ubuntu-20.04"
277+
runs-on: ubuntu-24.04
278278
steps:
279279
- uses: actions/checkout@v4
280280
with:
@@ -307,7 +307,7 @@ jobs:
307307
native-linux-tests-4:
308308
needs: generate-linux-launcher
309309
timeout-minutes: 120
310-
runs-on: "ubuntu-20.04"
310+
runs-on: ubuntu-24.04
311311
steps:
312312
- uses: actions/checkout@v4
313313
with:
@@ -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:
@@ -1037,7 +1037,7 @@ jobs:
10371037

10381038
generate-mostly-static-launcher:
10391039
timeout-minutes: 120
1040-
runs-on: ubuntu-20.04
1040+
runs-on: ubuntu-24.04
10411041
steps:
10421042
- uses: actions/checkout@v4
10431043
with:
@@ -1061,7 +1061,7 @@ jobs:
10611061
native-mostly-static-tests-1:
10621062
needs: generate-mostly-static-launcher
10631063
timeout-minutes: 120
1064-
runs-on: ubuntu-20.04
1064+
runs-on: ubuntu-24.04
10651065
steps:
10661066
- uses: actions/checkout@v4
10671067
with:
@@ -1108,7 +1108,7 @@ jobs:
11081108
native-mostly-static-tests-2:
11091109
needs: generate-mostly-static-launcher
11101110
timeout-minutes: 120
1111-
runs-on: ubuntu-20.04
1111+
runs-on: ubuntu-24.04
11121112
steps:
11131113
- uses: actions/checkout@v4
11141114
with:
@@ -1141,7 +1141,7 @@ jobs:
11411141
native-mostly-static-tests-3:
11421142
needs: generate-mostly-static-launcher
11431143
timeout-minutes: 120
1144-
runs-on: ubuntu-20.04
1144+
runs-on: ubuntu-24.04
11451145
steps:
11461146
- uses: actions/checkout@v4
11471147
with:
@@ -1174,7 +1174,7 @@ jobs:
11741174
native-mostly-static-tests-4:
11751175
needs: generate-mostly-static-launcher
11761176
timeout-minutes: 120
1177-
runs-on: ubuntu-20.04
1177+
runs-on: ubuntu-24.04
11781178
steps:
11791179
- uses: actions/checkout@v4
11801180
with:
@@ -1207,7 +1207,7 @@ jobs:
12071207
native-mostly-static-tests-5:
12081208
needs: generate-mostly-static-launcher
12091209
timeout-minutes: 120
1210-
runs-on: ubuntu-20.04
1210+
runs-on: ubuntu-24.04
12111211
steps:
12121212
- uses: actions/checkout@v4
12131213
with:
@@ -1240,7 +1240,7 @@ jobs:
12401240

12411241
generate-static-launcher:
12421242
timeout-minutes: 120
1243-
runs-on: ubuntu-20.04
1243+
runs-on: ubuntu-24.04
12441244
steps:
12451245
- uses: actions/checkout@v4
12461246
with:
@@ -1264,7 +1264,7 @@ jobs:
12641264
native-static-tests-1:
12651265
needs: generate-static-launcher
12661266
timeout-minutes: 120
1267-
runs-on: ubuntu-20.04
1267+
runs-on: ubuntu-24.04
12681268
steps:
12691269
- uses: actions/checkout@v4
12701270
with:
@@ -1311,7 +1311,7 @@ jobs:
13111311
native-static-tests-2:
13121312
needs: generate-static-launcher
13131313
timeout-minutes: 120
1314-
runs-on: ubuntu-20.04
1314+
runs-on: ubuntu-24.04
13151315
steps:
13161316
- uses: actions/checkout@v4
13171317
with:
@@ -1346,7 +1346,7 @@ jobs:
13461346
native-static-tests-3:
13471347
needs: generate-static-launcher
13481348
timeout-minutes: 120
1349-
runs-on: ubuntu-20.04
1349+
runs-on: ubuntu-24.04
13501350
steps:
13511351
- uses: actions/checkout@v4
13521352
with:
@@ -1381,7 +1381,7 @@ jobs:
13811381
native-static-tests-4:
13821382
needs: generate-static-launcher
13831383
timeout-minutes: 120
1384-
runs-on: ubuntu-20.04
1384+
runs-on: ubuntu-24.04
13851385
steps:
13861386
- uses: actions/checkout@v4
13871387
with:
@@ -1416,7 +1416,7 @@ jobs:
14161416
native-static-tests-5:
14171417
needs: generate-static-launcher
14181418
timeout-minutes: 120
1419-
runs-on: ubuntu-20.04
1419+
runs-on: ubuntu-24.04
14201420
steps:
14211421
- uses: actions/checkout@v4
14221422
with:
@@ -1450,7 +1450,7 @@ jobs:
14501450

14511451
docs-tests:
14521452
# for now, let's run those tests only on ubuntu
1453-
runs-on: ubuntu-20.04
1453+
runs-on: ubuntu-24.04
14541454
steps:
14551455
- uses: actions/checkout@v4
14561456
with:
@@ -1478,7 +1478,7 @@ jobs:
14781478

14791479
checks:
14801480
timeout-minutes: 30
1481-
runs-on: ubuntu-20.04
1481+
runs-on: ubuntu-24.04
14821482
steps:
14831483
- uses: actions/checkout@v4
14841484
with:
@@ -1505,7 +1505,7 @@ jobs:
15051505
15061506
format:
15071507
timeout-minutes: 15
1508-
runs-on: ubuntu-20.04
1508+
runs-on: ubuntu-24.04
15091509
steps:
15101510
- uses: actions/checkout@v4
15111511
with:
@@ -1519,7 +1519,7 @@ jobs:
15191519

15201520
reference-doc:
15211521
timeout-minutes: 15
1522-
runs-on: ubuntu-20.04
1522+
runs-on: ubuntu-24.04
15231523
steps:
15241524
- uses: actions/checkout@v4
15251525
with:
@@ -1539,7 +1539,7 @@ jobs:
15391539
15401540
bloop-memory-footprint:
15411541
timeout-minutes: 120
1542-
runs-on: ubuntu-20.04
1542+
runs-on: ubuntu-24.04
15431543
steps:
15441544
- uses: actions/checkout@v4
15451545
with:
@@ -1561,7 +1561,7 @@ jobs:
15611561

15621562
test-hypothetical-sbt-export:
15631563
timeout-minutes: 120
1564-
runs-on: "ubuntu-20.04"
1564+
runs-on: ubuntu-24.04
15651565
steps:
15661566
- uses: actions/checkout@v4
15671567
with:
@@ -1637,7 +1637,7 @@ jobs:
16371637
- reference-doc
16381638
- docs-tests
16391639
if: github.event_name == 'push' && github.repository == 'VirtusLab/scala-cli'
1640-
runs-on: ubuntu-20.04
1640+
runs-on: ubuntu-24.04
16411641
steps:
16421642
- uses: actions/checkout@v4
16431643
with:
@@ -1717,7 +1717,7 @@ jobs:
17171717
- generate-linux-arm64-native-launcher
17181718
- publish
17191719
if: github.event_name == 'push'
1720-
runs-on: ubuntu-20.04
1720+
runs-on: ubuntu-24.04
17211721
steps:
17221722
- uses: actions/checkout@v4
17231723
with:
@@ -1782,7 +1782,7 @@ jobs:
17821782
needs:
17831783
- launchers
17841784
- publish
1785-
runs-on: ubuntu-20.04
1785+
runs-on: ubuntu-24.04
17861786
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'VirtusLab/scala-cli'
17871787
steps:
17881788
- uses: actions/checkout@v4

‎modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class NativePackagerTests extends ScalaCliSuite {
196196
"/workdir",
197197
"-v",
198198
s"${root / destDir}:/workdir",
199-
"openjdk:17-slim",
199+
"eclipse-temurin:17-jdk",
200200
"./run.sh"
201201
).call(
202202
cwd = root,

‎project/deps.sc

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ object Deps {
125125
def maxScalaNativeForTypelevelToolkit = scalaNative04
126126
def maxScalaNativeForScalaPy = scalaNative04
127127
def maxScalaNativeForMillExport = scalaNative04
128-
def scalaPackager = "0.1.31"
128+
def scalaPackager = "0.1.32"
129129
def signingCli = "0.2.4"
130130
def signingCliJvmVersion = Java.defaultJava
131131
def javaSemanticdb = "0.10.0"

0 commit comments

Comments
 (0)