From 863e93d0ea619b5c56f70e72fe406aabc588bcd3 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Mon, 27 May 2024 09:34:46 -0600 Subject: [PATCH] fix(ci): Enable multiarch with qemu Signed-off-by: RJ Trujillo --- .github/workflows/build-40.yaml | 2 +- .github/workflows/reusable-build.yaml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-40.yaml b/.github/workflows/build-40.yaml index ef82bff..1a7445e 100644 --- a/.github/workflows/build-40.yaml +++ b/.github/workflows/build-40.yaml @@ -1,4 +1,4 @@ -name: ublue main 40 +name: ublue asahi 40 on: pull_request: merge_group: diff --git a/.github/workflows/reusable-build.yaml b/.github/workflows/reusable-build.yaml index 7b7e65f..8940557 100644 --- a/.github/workflows/reusable-build.yaml +++ b/.github/workflows/reusable-build.yaml @@ -140,6 +140,9 @@ jobs: io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/main/README.md io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 + - name: Set up qemu + uses: docker/setup-qemu-action@v2 + - name: Pull base image uses: Wandalen/wretry.action@v3.5.0 with: @@ -148,14 +151,14 @@ jobs: command: | # pull the base image used for FROM in containerfile so # we can retry on that unfortunately common failure case - podman pull quay.io/${{ env.SOURCE_ORG }}/${{ env.SOURCE_IMAGE }}:${{ matrix.fedora_version }} + podman pull --platform linux/aarch64 quay.io/${{ env.SOURCE_ORG }}/${{ env.SOURCE_IMAGE }}:${{ matrix.fedora_version }} # Build image using Buildah action - name: Build Image id: build_image uses: redhat-actions/buildah-build@v2 with: - archs: "aarch64" + arch: "aarch64" containerfiles: | ./Containerfile image: ${{ env.IMAGE_NAME }} @@ -167,6 +170,7 @@ jobs: SOURCE_IMAGE=${{ env.SOURCE_IMAGE }} FEDORA_MAJOR_VERSION=${{ matrix.fedora_version }} labels: ${{ steps.meta.outputs.labels }} + platforms: "linux/aarch64" oci: false # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.