29
29
rust-target : x86_64-apple-darwin
30
30
- os : macos-14 # ARM
31
31
rust-target : aarch64-apple-darwin
32
- - os : ubuntu-latest # x64
32
+ - os : ubuntu-24.04 # x64
33
33
rust-target : x86_64-unknown-linux-musl
34
- - os : buildjet-2vcpu- ubuntu-2204 -arm # ARM
34
+ - os : ubuntu-24.04 -arm # ARM
35
35
rust-target : aarch64-unknown-linux-musl
36
36
- os : windows-latest
37
37
rust-target : x86_64-pc-windows-gnu
@@ -86,16 +86,16 @@ jobs:
86
86
fail-fast : false
87
87
matrix :
88
88
include :
89
- - os : ubuntu-latest # x64
89
+ - os : ubuntu-24.04 # x64
90
90
ocaml_compiler : ocaml-variants.5.2.1+options,ocaml-option-static
91
91
upload_binaries : true
92
92
upload_libs : true
93
+ - os : ubuntu-24.04-arm # ARM
94
+ ocaml_compiler : ocaml-variants.5.2.1+options,ocaml-option-static
95
+ upload_binaries : true
93
96
# Build the playground compiler and run the benchmarks on the fastest runner
94
97
build_playground : true
95
98
benchmarks : true
96
- - os : buildjet-2vcpu-ubuntu-2204-arm # ARM
97
- ocaml_compiler : ocaml-variants.5.2.1+options,ocaml-option-static
98
- upload_binaries : true
99
99
- os : macos-13 # x64
100
100
ocaml_compiler : 5.2.1
101
101
upload_binaries : true
@@ -107,11 +107,11 @@ jobs:
107
107
upload_binaries : true
108
108
109
109
# Verify that the compiler still builds with older OCaml versions
110
- - os : ubuntu-latest
110
+ - os : ubuntu-24.04
111
111
ocaml_compiler : ocaml-variants.5.0.0+options,ocaml-option-static
112
- - os : ubuntu-latest
112
+ - os : ubuntu-24.04
113
113
ocaml_compiler : ocaml-variants.4.14.2+options,ocaml-option-static
114
- - os : ubuntu-latest
114
+ - os : ubuntu-24.04
115
115
ocaml_compiler : ocaml-variants.4.13.0+options,ocaml-option-static
116
116
117
117
runs-on : ${{matrix.os}}
@@ -142,11 +142,11 @@ jobs:
142
142
143
143
- name : Install dependencies (Linux)
144
144
if : runner.os == 'Linux'
145
- uses :
awalsh128/[email protected] .2
145
+ uses :
awalsh128/[email protected] .3
146
146
with :
147
147
# See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
148
148
packages : bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
149
- version : v2
149
+ version : v3
150
150
151
151
# matrix.ocaml_compiler may contain commas
152
152
- name : Get OPAM cache key
@@ -167,7 +167,7 @@ jobs:
167
167
key : ${{ env.opam_cache_key }}
168
168
169
169
- name : Use OCaml ${{matrix.ocaml_compiler}}
170
-
170
+
171
171
if : steps.cache-opam-env.outputs.cache-hit != 'true'
172
172
with :
173
173
ocaml-compiler : ${{matrix.ocaml_compiler}}
@@ -269,7 +269,7 @@ jobs:
269
269
if : steps.ninja-build-cache.outputs.cache-hit != 'true'
270
270
uses : actions/setup-python@v5
271
271
with :
272
- python-version : ' 3.10'
272
+ python-version : " 3.10"
273
273
274
274
- name : Setup MSVC for ninja build (Windows)
275
275
if : steps.ninja-build-cache.outputs.cache-hit != 'true' && runner.os == 'Windows'
@@ -316,7 +316,7 @@ jobs:
316
316
run : git diff --ignore-cr-at-eol --exit-code tests
317
317
318
318
- name : Run analysis / tools tests
319
- if : runner.os != 'Windows' && matrix.os != 'buildjet-2vcpu- ubuntu-2204 -arm'
319
+ if : runner.os != 'Windows' && matrix.os != 'ubuntu-24.04 -arm'
320
320
run : opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test
321
321
322
322
- name : Run gentype tests
@@ -392,7 +392,7 @@ jobs:
392
392
- build-compiler
393
393
- build-rewatch
394
394
395
- runs-on : ubuntu-latest
395
+ runs-on : ubuntu-24.04
396
396
397
397
steps :
398
398
- name : Checkout
@@ -447,8 +447,8 @@ jobs:
447
447
os : [
448
448
macos-13, # x64
449
449
macos-14, # ARM
450
- ubuntu-latest ,
451
- buildjet-2vcpu- ubuntu-2204 -arm,
450
+ ubuntu-24.04 ,
451
+ ubuntu-24.04 -arm,
452
452
windows-latest,
453
453
]
454
454
@@ -486,7 +486,7 @@ jobs:
486
486
487
487
if : startsWith(github.ref, 'refs/tags/v')
488
488
489
- runs-on : ubuntu-latest
489
+ runs-on : ubuntu-24.04
490
490
491
491
steps :
492
492
- name : Checkout
0 commit comments