Merge pull request #5669 from crazy-max/ci-arm64

ci: switch jobs using emulation to native arm64 runners
moby · Jan 23, 2025 · 570fde6 · 570fde6
2 parents 9a39e2c + 8704b03
commit 570fde6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml
@@ -229,17 +229,14 @@ jobs:
           vagrant ssh -- "sudo cat /vagrant/.tmp/logs/containerd"
 
   sandbox-build:
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     strategy:
       fail-fast: false
       matrix:
         platform:
           - linux/amd64
           - linux/arm64
     steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -64,11 +64,8 @@ jobs:
           targets: ${{ matrix.target }}
 
   archutil-arm64:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.04-arm
     steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3