Skip to content

Commit c470af6

Browse files
committed
Merge pull request #1878 from pguyot/w40/run-tests-on-aarch64-runner
Use new arm64 runners for Linux tests Continuation of: - #1890 These changes are made under both the "Apache 2.0" and the "GNU Lesser General Public License 2.1 or later" license terms (dual license). SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
2 parents a441efe + 79a6c53 commit c470af6

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-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: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,26 @@ jobs:
301301
cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
302302
jit_target_arch: "x86_64"
303303

304+
# arm64 builds
305+
- os: "ubuntu-24.04-arm"
306+
cc: "cc"
307+
cxx: "c++"
308+
cflags: "-O2"
309+
otp: "28"
310+
elixir_version: "1.17"
311+
rebar3_version: "3.24.0"
312+
cmake_opts_other: "-DAVM_WARNINGS_ARE_ERRORS=OFF"
313+
314+
- os: "ubuntu-24.04-arm"
315+
cc: "cc"
316+
cxx: "c++"
317+
cflags: ""
318+
otp: "28"
319+
elixir_version: "1.17"
320+
rebar3_version: "3.24.0"
321+
cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
322+
jit_target_arch: "aarch64"
323+
304324
env:
305325
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' }}
306326
CC: ${{ matrix.cc }}
@@ -324,8 +344,16 @@ jobs:
324344
run: sudo apt update -y
325345

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

350+
- name: "Install deps"
351+
if: matrix.container == ''
352+
run: |
353+
sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen libmbedtls-dev libc6-dbg
354+
# Get a more recent valgrind
355+
sudo snap install valgrind --classic
356+
329357
- name: "Checkout repo"
330358
uses: actions/checkout@v4
331359
with:
@@ -387,7 +415,7 @@ jobs:
387415

388416
# Test
389417
- name: "Test: test-erlang"
390-
timeout-minutes: 15
418+
timeout-minutes: 30
391419
working-directory: build
392420
run: |
393421
ulimit -c unlimited

0 commit comments

Comments
 (0)