X-Smart-Squash: Squashed 6 commits:

dfe1293 use arm runner for arm builds
a70db96 test
e92dc17 checkarch
bbfc2d4 expand
7474f22 include
901f5496a builder

Author: robbycochran

.github/workflows/collector-builder.yml

@@ -36,11 +36,10 @@ jobs:
               - builder/install/**
               - builder/third_party/**
               - builder/Dockerfile
-              - .github/workflows/collector-builder.yml
+              # XXX uncomment before commit XXX- .github/workflows/collector-builder.yml
 
   build-builder-image:
     name: Build the builder image
-    runs-on: ubuntu-24.04
     # Multiarch builds sometimes take for eeeeeeeeeever
     timeout-minutes: 480
     needs:
@@ -57,7 +56,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [amd64, ppc64le, s390x, arm64]
+        include:
+        - arch: amd64
+          runner: ubuntu-24.04
+        - arch: ppc64le
+          runner: ubuntu-24.04
+        - arch: s390x
+          runner: ubuntu-24.04
+        - arch: arm64
+          runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
 
     env:
       PLATFORM: linux/${{ matrix.arch }}

.github/workflows/collector.yml

@@ -30,11 +30,17 @@ env:
 jobs:
   build-collector-image:
     name: Build Collector
-    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        arch: [amd64, ppc64le, arm64]
+        include:
+        - arch: amd64
+          runner: ubuntu-24.04
+        - arch: ppc64le
+          runner: ubuntu-24.04
+        - arch: arm64
+          runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
 
     env:
       PLATFORM: linux/${{ matrix.arch }}
@@ -75,6 +81,7 @@ jobs:
         if: |
           github.event_name != 'pull_request' ||
           matrix.arch == 'amd64' ||
+          matrix.arch == 'arm64' ||
           contains(github.event.pull_request.labels.*.name, 'run-multiarch-builds')
         timeout-minutes: 480
         run: |