From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 19 Aug 2025 15:18:48 +0000 (+0200)
Subject: [Test] Run CI on ARM again
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5580%2Fhead;p=thirdparty%2Frspamd.git

[Test] Run CI on ARM again
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46fd669850..32def7d582 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,11 +18,18 @@ jobs:
       image: ghcr.io/rspamd/rspamd-build-docker:fedora-ci
       name: fedora-ci
 
-  ubuntu:
+  ubuntu_amd64:
     uses: ./.github/workflows/ci_rspamd.yml
     with:
       image: ghcr.io/rspamd/rspamd-build-docker:ubuntu-ci
-      name: ubuntu-ci
+      name: ubuntu-ci-amd64
+
+  ubuntu_arm64:
+    uses: ./.github/workflows/ci_rspamd.yml
+    with:
+      image: ghcr.io/rspamd/rspamd-build-docker:ubuntu-ci
+      name: ubuntu-ci-arm64
+      runner: ubuntu-24.04-arm
 
   ubuntu-focal:
     uses: ./.github/workflows/ci_rspamd_build.yml
@@ -43,8 +50,8 @@ jobs:
       name: centos-9
 
   webui-e2e-playwright:
-    needs: ubuntu
+    needs: ubuntu_amd64
     uses: ./.github/workflows/ci_webui_e2e_playwright.yml
     with:
       image: ghcr.io/rspamd/rspamd-build-docker:ubuntu-ci
-      name: ubuntu-ci
+      name: ubuntu-ci-amd64
diff --git a/.github/workflows/ci_rspamd.yml b/.github/workflows/ci_rspamd.yml
index fb0466cb79..1486ea28df 100644
--- a/.github/workflows/ci_rspamd.yml
+++ b/.github/workflows/ci_rspamd.yml
@@ -9,6 +9,9 @@ on:
       name:
         required: true
         type: string
+      runner:
+        type: string
+        default: 'ubuntu-24.04'
 
 env:
   CTEST_OUTPUT_ON_FAILURE: 1
@@ -16,7 +19,7 @@ env:
 
 jobs:
   test:
-    runs-on: [ "ubuntu-latest" ]
+    runs-on: "${{ inputs.runner }}"
     container:
       image: ${{ inputs.image }}
       options: --user root
@@ -94,7 +97,7 @@ jobs:
           retention-days: 1
 
       - name: Upload built rspamd
-        if: inputs.name == 'ubuntu-ci'
+        if: inputs.name == 'ubuntu-ci-amd64'
         uses: actions/upload-artifact@v4
         with:
           name: rspamd-binary-${{ inputs.name }}
diff --git a/.github/workflows/ci_webui_e2e_playwright.yml b/.github/workflows/ci_webui_e2e_playwright.yml
index b214fcee0b..0241ad50e1 100644
--- a/.github/workflows/ci_webui_e2e_playwright.yml
+++ b/.github/workflows/ci_webui_e2e_playwright.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Download rspamd binary from build job
         uses: actions/download-artifact@v4
         with:
-          name: rspamd-binary-ubuntu-ci
+          name: rspamd-binary-${{ inputs.name }}
           path: ${{ env.PREFIX }}
 
       - name: Prepare rspamd configuration