2929 rust-target : x86_64-apple-darwin
3030 - os : macos-14 # ARM
3131 rust-target : aarch64-apple-darwin
32- - os : ubuntu-latest # x64
32+ - os : ubuntu-24.04 # x64
3333 rust-target : x86_64-unknown-linux-musl
34- - os : buildjet-2vcpu- ubuntu-2204 -arm # ARM
34+ - os : ubuntu-24.04 -arm # ARM
3535 rust-target : aarch64-unknown-linux-musl
3636 - os : windows-latest
3737 rust-target : x86_64-pc-windows-gnu
@@ -86,16 +86,16 @@ jobs:
8686 fail-fast : false
8787 matrix :
8888 include :
89- - os : ubuntu-latest # x64
89+ - os : ubuntu-24.04 # x64
9090 ocaml_compiler : ocaml-variants.5.2.1+options,ocaml-option-static
9191 upload_binaries : true
9292 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
9396 # Build the playground compiler and run the benchmarks on the fastest runner
9497 build_playground : true
9598 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
9999 - os : macos-13 # x64
100100 ocaml_compiler : 5.2.1
101101 upload_binaries : true
@@ -107,11 +107,11 @@ jobs:
107107 upload_binaries : true
108108
109109 # Verify that the compiler still builds with older OCaml versions
110- - os : ubuntu-latest
110+ - os : ubuntu-24.04
111111 ocaml_compiler : ocaml-variants.5.0.0+options,ocaml-option-static
112- - os : ubuntu-latest
112+ - os : ubuntu-24.04
113113 ocaml_compiler : ocaml-variants.4.14.2+options,ocaml-option-static
114- - os : ubuntu-latest
114+ - os : ubuntu-24.04
115115 ocaml_compiler : ocaml-variants.4.13.0+options,ocaml-option-static
116116
117117 runs-on : ${{matrix.os}}
@@ -142,11 +142,11 @@ jobs:
142142
143143 - name : Install dependencies (Linux)
144144 if : runner.os == 'Linux'
145- uses : awalsh128/cache-apt-pkgs-action@v1.4.2
145+ uses : awalsh128/cache-apt-pkgs-action@v1.4.3
146146 with :
147147 # See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
148148 packages : bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
149- version : v2
149+ version : v3
150150
151151 # matrix.ocaml_compiler may contain commas
152152 - name : Get OPAM cache key
@@ -167,7 +167,7 @@ jobs:
167167 key : ${{ env.opam_cache_key }}
168168
169169 - name : Use OCaml ${{matrix.ocaml_compiler}}
170- uses : ocaml/setup-ocaml@v3.2.2
170+ uses : ocaml/setup-ocaml@v3.2.5
171171 if : steps.cache-opam-env.outputs.cache-hit != 'true'
172172 with :
173173 ocaml-compiler : ${{matrix.ocaml_compiler}}
@@ -269,7 +269,7 @@ jobs:
269269 if : steps.ninja-build-cache.outputs.cache-hit != 'true'
270270 uses : actions/setup-python@v5
271271 with :
272- python-version : ' 3.10'
272+ python-version : " 3.10"
273273
274274 - name : Setup MSVC for ninja build (Windows)
275275 if : steps.ninja-build-cache.outputs.cache-hit != 'true' && runner.os == 'Windows'
@@ -316,7 +316,7 @@ jobs:
316316 run : git diff --ignore-cr-at-eol --exit-code tests
317317
318318 - 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'
320320 run : opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test
321321
322322 - name : Run gentype tests
@@ -392,7 +392,7 @@ jobs:
392392 - build-compiler
393393 - build-rewatch
394394
395- runs-on : ubuntu-latest
395+ runs-on : ubuntu-24.04
396396
397397 steps :
398398 - name : Checkout
@@ -447,8 +447,8 @@ jobs:
447447 os : [
448448 macos-13, # x64
449449 macos-14, # ARM
450- ubuntu-latest ,
451- buildjet-2vcpu- ubuntu-2204 -arm,
450+ ubuntu-24.04 ,
451+ ubuntu-24.04 -arm,
452452 windows-latest,
453453 ]
454454
@@ -486,7 +486,7 @@ jobs:
486486
487487 if : startsWith(github.ref, 'refs/tags/v')
488488
489- runs-on : ubuntu-latest
489+ runs-on : ubuntu-24.04
490490
491491 steps :
492492 - name : Checkout
0 commit comments