From bef4755bbe07593e054b98acd0cbe90d968c0a82 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sun, 8 Jun 2025 18:55:04 +0200 Subject: [PATCH] workflow: use arm runners for arm64 builds --- .github/workflows/build_release.yaml | 15 +++++++++++---- .github/workflows/build_test.yaml | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_release.yaml b/.github/workflows/build_release.yaml index f8164f4..9355614 100644 --- a/.github/workflows/build_release.yaml +++ b/.github/workflows/build_release.yaml @@ -3,16 +3,23 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.arch.runner }} permissions: contents: write strategy: matrix: debian_version: [bullseye, bookworm] - docker_arch: [amd64, arm/v7, arm64/v8] + arch: + - docker: amd64 + runner: ubuntu-24.04 + - docker: arm/v7 + runner: ubuntu-24.04 + - docker: arm64/v8 + runner: ubuntu-24.04-arm build_type: [generic, raspi] exclude: - - docker_arch: amd64 + - arch: + docker: amd64 build_type: raspi steps: - name: Checkout @@ -50,7 +57,7 @@ jobs: . env: DEBIAN_VERSION: ${{ matrix.debian_version }} - DOCKER_ARCH: ${{ matrix.docker_arch }} + DOCKER_ARCH: ${{ matrix.arch.docker }} BUILD_TYPE: ${{ matrix.build_type }} DOCKER_BUILDKIT: 1 - name: Create container diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 55f58ce..c9b8e7a 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -5,17 +5,29 @@ on: - 'RELEASE.md' pull_request: workflow_dispatch: + schedule: + - cron: '0 15 * * 2' # Runs at 15:00 (3pm) UTC every Tuesday jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.arch.runner }} strategy: matrix: debian_version: [bullseye, bookworm] - docker_arch: [amd64, arm/v7, arm64/v8] + arch: + - docker: amd64 + variant: amd64 + runner: ubuntu-24.04 + - docker: arm/v7 + variant: arm32v7 + runner: ubuntu-24.04 + - docker: arm64/v8 + variant: arm64v8 + runner: ubuntu-24.04-arm build_type: [generic, raspi] exclude: - - docker_arch: amd64 + - arch: + docker: amd64 build_type: raspi steps: - name: Checkout @@ -40,7 +52,7 @@ jobs: . env: DEBIAN_VERSION: ${{ matrix.debian_version }} - DOCKER_ARCH: ${{ matrix.docker_arch }} + DOCKER_ARCH: ${{ matrix.arch.docker }} BUILD_TYPE: ${{ matrix.build_type }} DOCKER_BUILDKIT: 1 - name: Create container @@ -50,6 +62,6 @@ jobs: - name: 'Upload debian files' uses: actions/upload-artifact@v4 with: - name: ${{ matrix.debian_version }}-${{ matrix.docker_arch }}-${{ matrix.build_type }}.zip + name: ${{ matrix.debian_version }}-${{ matrix.arch.variant }}-${{ matrix.build_type }}.zip path: deb/ retention-days: 14