Skip to content

Commit

Permalink
Use GitHub Linux ARM runners
Browse files Browse the repository at this point in the history
  • Loading branch information
cknitt committed Jan 18, 2025
1 parent 31fe30b commit 111ca65
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
rust-target: x86_64-apple-darwin
- os: macos-14 # ARM
rust-target: aarch64-apple-darwin
- os: ubuntu-latest # x64
- os: ubuntu-22.04 # x64
rust-target: x86_64-unknown-linux-musl
- os: buildjet-2vcpu-ubuntu-2204-arm # ARM
- os: ubuntu-22.04-arm # ARM
rust-target: aarch64-unknown-linux-musl
- os: windows-latest
rust-target: x86_64-pc-windows-gnu
Expand Down Expand Up @@ -86,14 +86,14 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-latest # x64
- os: ubuntu-22.04 # x64
ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
upload_binaries: true
upload_libs: true
# Build the playground compiler and run the benchmarks on the fastest runner
build_playground: true
benchmarks: true
- os: buildjet-2vcpu-ubuntu-2204-arm # ARM
- os: ubuntu-22.04-arm # ARM
ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
upload_binaries: true
- os: macos-13 # x64
Expand All @@ -107,11 +107,11 @@ jobs:
upload_binaries: true

# Verify that the compiler still builds with older OCaml versions
- os: ubuntu-latest
- os: ubuntu-22.04
ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
- os: ubuntu-latest
- os: ubuntu-22.04
ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
- os: ubuntu-latest
- os: ubuntu-22.04
ocaml_compiler: ocaml-variants.4.13.0+options,ocaml-option-static

runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
key: ${{ env.opam_cache_key }}

- name: Use OCaml ${{matrix.ocaml_compiler}}
uses: ocaml/[email protected].2
uses: ocaml/[email protected].5
if: steps.cache-opam-env.outputs.cache-hit != 'true'
with:
ocaml-compiler: ${{matrix.ocaml_compiler}}
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
run: git diff --ignore-cr-at-eol --exit-code tests

- name: Run analysis / tools tests
if: runner.os != 'Windows' && matrix.os != 'buildjet-2vcpu-ubuntu-2204-arm'
if: runner.os != 'Windows' && matrix.os != 'ubuntu-22.04-arm'
run: opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test

- name: Run gentype tests
Expand Down Expand Up @@ -392,7 +392,7 @@ jobs:
- build-compiler
- build-rewatch

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout
Expand Down Expand Up @@ -447,8 +447,8 @@ jobs:
os: [
macos-13, # x64
macos-14, # ARM
ubuntu-latest,
buildjet-2vcpu-ubuntu-2204-arm,
ubuntu-22.04,
ubuntu-22.04-arm,
windows-latest,
]

Expand Down Expand Up @@ -486,7 +486,7 @@ jobs:

if: startsWith(github.ref, 'refs/tags/v')

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout
Expand Down

0 comments on commit 111ca65

Please sign in to comment.