From 106b598309ef4142c6b9df772114a1cb6027a5e7 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Mon, 20 Jan 2025 11:14:34 +0100
Subject: [PATCH] build: use arm-native gha runners for distributed
 multi-platform

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 .../build/ci/github-actions/multi-platform.md | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/content/manuals/build/ci/github-actions/multi-platform.md b/content/manuals/build/ci/github-actions/multi-platform.md
index 71b48d32267..c56269ec2dd 100644
--- a/content/manuals/build/ci/github-actions/multi-platform.md
+++ b/content/manuals/build/ci/github-actions/multi-platform.md
@@ -129,13 +129,15 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+        - platform: linux/amd64
+          os: ubuntu-latest
+        - platform: linux/arm64
+          os: ubuntu-24.04-arm
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Prepare
         run: |
@@ -163,9 +165,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -284,8 +283,7 @@ target "image-all" {
   inherits = ["image"]
   platforms = [
     "linux/amd64",
-    "linux/arm/v6",
-    "linux/arm/v7",
+    "linux/riscv64",
     "linux/arm64"
   ]
 }
@@ -337,13 +335,13 @@ jobs:
           retention-days: 1
 
   build:
-    runs-on: ubuntu-latest
     needs:
       - prepare
     strategy:
       fail-fast: false
       matrix:
         platform: ${{ fromJson(needs.prepare.outputs.matrix) }}
+    runs-on: ${{ matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
     steps:
       - name: Prepare
         run: |
@@ -355,7 +353,7 @@ jobs:
         with:
           name: bake-meta
           path: ${{ runner.temp }}
-      
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -363,6 +361,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up QEMU
+        if: ${{ matrix.platform == 'linux/riscv64' }}
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx