From 3690d5e7f34dad115e1223846802a08f3dc4086e Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Wed, 29 Apr 2026 12:10:22 -0700 Subject: [PATCH] match docker arch to runner image, in case it speeds things up --- .github/workflows/docker_packaging_jobs.yml | 26 +++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker_packaging_jobs.yml b/.github/workflows/docker_packaging_jobs.yml index 5d86245a5..4f9f8b216 100644 --- a/.github/workflows/docker_packaging_jobs.yml +++ b/.github/workflows/docker_packaging_jobs.yml @@ -14,17 +14,20 @@ env: jobs: docker_build: runs-on: - - ubuntu-24.04 + - ${{ matrix.run-on }} # The default timeout of 60 minutes is a little low for compiling # cryptography on ARM architectures. timeout-minutes: 180 strategy: fail-fast: false matrix: - DOCKER_ARCH: - - arm32v6 - - arm64v8 - - amd64 + include: + - DOCKER_ARCH: arm64 + run-on: ubuntu-24.04-arm + - DOCKER_ARCH: amd64 + run-on: ubuntu-24.04 + - DOCKER_ARCH: armhf + run-on: ubuntu-24.04-arm steps: - name: checkout uses: actions/checkout@v6.0.2 @@ -54,14 +57,17 @@ jobs: needs: - docker_build runs-on: - - ubuntu-22.04 + - ${{ matrix.run-on }} strategy: fail-fast: false matrix: - DOCKER_ARCH: - - arm32v6 - - arm64v8 - - amd64 + include: + - DOCKER_ARCH: arm64 + run-on: ubuntu-24.04-arm + - DOCKER_ARCH: amd64 + run-on: ubuntu-24.04 + - DOCKER_ARCH: armhf + run-on: ubuntu-24.04-arm steps: - name: checkout uses: actions/checkout@v6.0.2