From 76394e93a818af92a682946a0dcb97fdabb71099 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 27 Sep 2025 09:21:26 +0100 Subject: [PATCH] ci: consolidate aarch64 tests on GitHub runners Currently we run aarch64 tests on both Cirrus CI and GitHub runners. However, Cirrus CI fails with "Monthly compute limit exceeded!". This change removes the redundant tests to streamline our CI process. Signed-off-by: Radostin Stoyanov --- .cirrus.yml | 22 ---------------------- .github/workflows/aarch64-test.yaml | 6 ++++-- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 99dd70d63..72dbb3898 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -88,28 +88,6 @@ task: build_script: | make -C scripts/ci vagrant-fedora-non-root -task: - name: aarch64 build GCC (native) - arm_container: - image: docker.io/library/ubuntu:jammy - cpu: 4 - memory: 4G - script: uname -a - build_script: | - contrib/apt-install make - make -C scripts/ci local - -task: - name: aarch64 build CLANG (native) - arm_container: - image: docker.io/library/ubuntu:jammy - cpu: 4 - memory: 4G - script: uname -a - build_script: | - contrib/apt-install make - make -C scripts/ci local CLANG=1 - task: name: aarch64 Fedora Rawhide arm_container: diff --git a/.github/workflows/aarch64-test.yaml b/.github/workflows/aarch64-test.yaml index 32b19e176..ebbecadb3 100644 --- a/.github/workflows/aarch64-test.yaml +++ b/.github/workflows/aarch64-test.yaml @@ -9,14 +9,16 @@ concurrency: jobs: build: - runs-on: ubuntu-24.04-arm strategy: matrix: + os: [ubuntu-24.04-arm, ubuntu-22.04-arm] target: [GCC=1, CLANG=1] + runs-on: ${{ matrix.os }} + steps: - uses: actions/checkout@v4 - - name: Run Tests ${{ matrix.target }} + - name: Run Tests ${{ matrix.target }} on ${{ matrix.os }} # Following tests are failing on the VMs: # ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out # 45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))