Skip to content

Commit 22618cb

Browse files
committed
Use new arm64 runners for Linux tests
Signed-off-by: Paul Guyot <[email protected]>
1 parent efc09d0 commit 22618cb

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-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: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,25 @@ 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: "-O2"
308+
otp: "28"
309+
elixir_version: "1.17"
310+
rebar3_version: "3.24.0"
311+
cmake_opts_other: "-DAVM_WARNINGS_ARE_ERRORS=OFF"
312+
313+
- os: "ubuntu-24.04-arm"
314+
cc: "cc"
315+
cxx: "c++"
316+
cflags: ""
317+
otp: "28"
318+
elixir_version: "1.17"
319+
rebar3_version: "3.24.0"
320+
cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
321+
303322
env:
304323
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' }}
305324
CC: ${{ matrix.cc }}
@@ -323,8 +342,16 @@ jobs:
323342
run: sudo apt update -y
324343

325344
- name: "Install deps"
345+
if: matrix.container != ''
326346
run: sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen valgrind libmbedtls-dev
327347

348+
- name: "Install deps"
349+
if: matrix.container == ''
350+
run: |
351+
sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen libmbedtls-dev libc6-dbg
352+
# Get a more recent valgrind
353+
sudo snap install valgrind --classic
354+
328355
- name: "Checkout repo"
329356
uses: actions/checkout@v4
330357
with:
@@ -386,7 +413,7 @@ jobs:
386413

387414
# Test
388415
- name: "Test: test-erlang"
389-
timeout-minutes: 15
416+
timeout-minutes: 30
390417
working-directory: build
391418
run: |
392419
ulimit -c unlimited

0 commit comments

Comments
 (0)