Skip to content

Commit 85373bb

Browse files
committed
Use new arm64 runners for Linux tests
Supercedes atomvm#1878 Signed-off-by: Peter M <petermm@gmail.com>
1 parent 60b5e83 commit 85373bb

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-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: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,14 @@ jobs:
300300
rebar3_version: "3.24.0"
301301
cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
302302

303+
# arm64 build
304+
- os: "ubuntu-24.04-arm"
305+
rebar3_version: "3.24.0"
306+
cc: "cc"
307+
cxx: "c++"
308+
cflags: "-O2"
309+
otp: "28"
310+
303311
env:
304312
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' }}
305313
CC: ${{ matrix.cc }}
@@ -390,9 +398,16 @@ jobs:
390398
working-directory: build
391399
run: |
392400
ulimit -c unlimited
393-
valgrind --error-exitcode=1 ./tests/test-erlang -s prime_smp
394401
./tests/test-erlang -s prime_smp
395402
403+
- name: "Test: valgrind test-erlang"
404+
if: matrix.os != "ubuntu-24.04-arm"
405+
timeout-minutes: 15
406+
working-directory: build
407+
run: |
408+
ulimit -c unlimited
409+
valgrind --error-exitcode=1 ./tests/test-erlang -s prime_smp
410+
396411
- name: "Test: test-enif"
397412
working-directory: build
398413
run: |

0 commit comments

Comments
 (0)