Skip to content

Commit 6d8a164

Browse files
committed
Use new arm64 runners for Linux tests
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
1 parent d2e6ded commit 6d8a164

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

.github/workflows/build-and-test-other.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
strategy:
7171
fail-fast: false
7272
matrix:
73-
arch: ["arm32v5", "arm32v7", "arm64v8"]
73+
arch: ["arm32v5", "arm32v7"]
7474

7575
include:
7676
- arch: "arm32v5"
@@ -100,12 +100,6 @@ jobs:
100100
cflags: "-mcpu=cortex-a7 -mfloat-abi=hard -O2 -mthumb -mthumb-interwork -D_FILE_OFFSET_BITS=64"
101101
cmake_opts: "-DAVM_WARNINGS_ARE_ERRORS=ON"
102102

103-
- arch: "arm64v8"
104-
platform: "arm64/v8"
105-
tag: "bookworm"
106-
cflags: "-O2"
107-
cmake_opts: "-DAVM_WARNINGS_ARE_ERRORS=ON"
108-
109103
# Required for testing big endian archs
110104
- arch: "s390x"
111105
platform: "s390x"

.github/workflows/build-and-test.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,24 @@ jobs:
300300
rebar3_version: "3.24.0"
301301
cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
302302

303+
# arm64 builds
304+
- os: "ubuntu-24.04-arm"
305+
cc: "cc"
306+
cxx: "c++"
307+
cflags: ""
308+
otp: "28"
309+
elixir_version: "1.17"
310+
rebar3_version: "3.24.0"
311+
312+
- os: "ubuntu-24.04-arm"
313+
cc: "cc"
314+
cxx: "c++"
315+
cflags: ""
316+
otp: "28"
317+
elixir_version: "1.17"
318+
rebar3_version: "3.24.0"
319+
cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
320+
303321
env:
304322
ImageOS: ${{ matrix.container == 'ubuntu:20.04' && 'ubuntu20' || matrix.os == 'ubuntu-20.04' && 'ubuntu20' || matrix.os == 'ubuntu-22.04' && 'ubuntu22' || matrix.os == 'ubuntu-24.04' && 'ubuntu24' || 'ubuntu24' }}
305323
CC: ${{ matrix.cc }}
@@ -323,8 +341,16 @@ jobs:
323341
run: sudo apt update -y
324342

325343
- name: "Install deps"
344+
if: matrix.os != 'ubuntu-24.04-arm'
326345
run: sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen valgrind libmbedtls-dev
327346

347+
- name: "Install deps"
348+
if: matrix.os == 'ubuntu-24.04-arm'
349+
run: |
350+
sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen libmbedtls-dev
351+
# Get a more recent valgrind
352+
sudo snap install valgrind --classic
353+
328354
- name: "Checkout repo"
329355
uses: actions/checkout@v4
330356
with:
@@ -386,7 +412,7 @@ jobs:
386412

387413
# Test
388414
- name: "Test: test-erlang"
389-
timeout-minutes: 15
415+
timeout-minutes: 30
390416
working-directory: build
391417
run: |
392418
ulimit -c unlimited

0 commit comments

Comments
 (0)