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..51b90b2 100644 --- a/.github/workflows/reusable-build.yaml +++ b/.github/workflows/reusable-build.yaml @@ -15,7 +15,7 @@ concurrency: jobs: build_ublue: - name: main + name: asahi runs-on: ubuntu-24.04 permissions: contents: read @@ -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,13 @@ 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" containerfiles: | ./Containerfile image: ${{ env.IMAGE_NAME }} @@ -167,6 +169,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.