Skip to content

Commit 004f57f

Browse files
committed
ci: Move Valgrind build for arm64 from Cirrus to GHA
1 parent 5fafdfc commit 004f57f

File tree

2 files changed

+29
-95
lines changed

2 files changed

+29
-95
lines changed

.cirrus.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,18 +305,38 @@ jobs:
305305

306306

307307
valgrind_debian:
308-
name: "Valgrind (memcheck)"
309-
runs-on: ubuntu-latest
308+
name: "Valgrind ${{ matrix.binary_arch }} (memcheck)"
309+
runs-on: ${{ matrix.runner }}
310310
needs: docker_cache
311311

312312
strategy:
313313
fail-fast: false
314314
matrix:
315-
configuration:
316-
- env_vars: { CC: 'clang', ASM: 'auto' }
317-
- env_vars: { CC: 'i686-linux-gnu-gcc', HOST: 'i686-linux-gnu', ASM: 'auto' }
318-
- env_vars: { CC: 'clang', ASM: 'no', ECMULTGENKB: 2, ECMULTWINDOW: 2 }
319-
- env_vars: { CC: 'i686-linux-gnu-gcc', HOST: 'i686-linux-gnu', ASM: 'no', ECMULTGENKB: 2, ECMULTWINDOW: 2 }
315+
include:
316+
- docker_arch: x64
317+
runner: ubuntu-latest
318+
binary_arch: x64
319+
env_vars: { CC: 'clang', ASM: 'auto' }
320+
- docker_arch: x64
321+
runner: ubuntu-latest
322+
binary_arch: i686
323+
env_vars: { CC: 'i686-linux-gnu-gcc', HOST: 'i686-linux-gnu', ASM: 'auto' }
324+
- docker_arch: arm64
325+
runner: ubuntu-24.04-arm
326+
binary_arch: arm64
327+
env_vars: { CC: 'clang', ASM: 'auto' }
328+
- docker_arch: x64
329+
runner: ubuntu-latest
330+
binary_arch: x64
331+
env_vars: { CC: 'clang', ASM: 'no', ECMULTGENKB: 2, ECMULTWINDOW: 2 }
332+
- docker_arch: x64
333+
runner: ubuntu-latest
334+
binary_arch: i686
335+
env_vars: { CC: 'i686-linux-gnu-gcc', HOST: 'i686-linux-gnu', ASM: 'no', ECMULTGENKB: 2, ECMULTWINDOW: 2 }
336+
- docker_arch: arm64
337+
runner: ubuntu-24.04-arm
338+
binary_arch: arm64
339+
env_vars: { CC: 'clang', ASM: 'no', ECMULTGENKB: 2, ECMULTWINDOW: 2 }
320340

321341
env:
322342
# The `--error-exitcode` is required to make the test fail if valgrind found errors,
@@ -336,11 +356,11 @@ jobs:
336356
uses: actions/checkout@v4
337357

338358
- name: CI script
339-
env: ${{ matrix.configuration.env_vars }}
359+
env: ${{ matrix.env_vars }}
340360
uses: ./.github/actions/run-in-docker-action
341361
with:
342362
dockerfile: ./ci/linux-debian.Dockerfile
343-
tag: x64-debian-image
363+
tag: ${{ matrix.docker_arch }}-debian-image
344364

345365
- name: Print logs
346366
uses: ./.github/actions/print-logs

0 commit comments

Comments
 (0)