Skip to content

Commit

Permalink
Use GitHub Linux ARM runners (#7251)
Browse files Browse the repository at this point in the history
* Use GitHub Linux ARM runners

* Format

* Linux ARM is fastest

* Use Ubuntu 24.04
  • Loading branch information
cknitt authored Jan 18, 2025
1 parent c4a30cc commit 4a5c3ea
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 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-24.04 # x64
rust-target: x86_64-unknown-linux-musl
- os: buildjet-2vcpu-ubuntu-2204-arm # ARM
- os: ubuntu-24.04-arm # ARM
rust-target: aarch64-unknown-linux-musl
- os: windows-latest
rust-target: x86_64-pc-windows-gnu
Expand Down Expand Up @@ -86,16 +86,16 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-latest # x64
- os: ubuntu-24.04 # x64
ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
upload_binaries: true
upload_libs: true
- os: ubuntu-24.04-arm # ARM
ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
upload_binaries: 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
ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
upload_binaries: true
- os: macos-13 # x64
ocaml_compiler: 5.2.1
upload_binaries: true
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-24.04
ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
- os: ubuntu-latest
- os: ubuntu-24.04
ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
- os: ubuntu-latest
- os: ubuntu-24.04
ocaml_compiler: ocaml-variants.4.13.0+options,ocaml-option-static

runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -142,11 +142,11 @@ jobs:

- name: Install dependencies (Linux)
if: runner.os == 'Linux'
uses: awalsh128/[email protected].2
uses: awalsh128/[email protected].3
with:
# See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
version: v2
version: v3

# matrix.ocaml_compiler may contain commas
- name: Get OPAM cache key
Expand All @@ -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 @@ -269,7 +269,7 @@ jobs:
if: steps.ninja-build-cache.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: "3.10"

- name: Setup MSVC for ninja build (Windows)
if: steps.ninja-build-cache.outputs.cache-hit != 'true' && runner.os == 'Windows'
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-24.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-24.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-24.04,
ubuntu-24.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-24.04

steps:
- name: Checkout
Expand Down

1 comment on commit 4a5c3ea

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Syntax Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.05.

Benchmark suite Current: 4a5c3ea Previous: e1b7fb7 Ratio
Parse RedBlackTree.res - time/run 1.3670755933333334 ms 1.2123143266666667 ms 1.13
Parse Napkinscript.res - time/run 42.52120175333333 ms 39.28006235333333 ms 1.08
Parse HeroGraphic.res - time/run 6.422776099999999 ms 5.13472718 ms 1.25

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.