Skip to content

Commit

Permalink
Revert "Add matrix to build arm64 on arm runners"
Browse files Browse the repository at this point in the history
This reverts commit 14e9a3a.

The runners would overwrite the architecture layers of each other so the
slowest runner wins:
docker/build-push-action#1287
  • Loading branch information
ntnn committed Jan 30, 2025
1 parent 14e9a3a commit 8bc6fef
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions .github/workflows/image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,11 @@ on:
workflow_dispatch:

jobs:
# This job builds an image from the current main branch in the
# official repository.
# The resulting image is tagged with main and latest.
build-main:
strategy:
matrix:
include:
- runner: ubuntu-latest
platforms: linux/amd64,linux/arm/v7
- runner: ubuntu-24.04-arm
platforms: linux/arm64

runs-on: ${{ matrix.runner }}
# This job builds an image from the current main branch in the
# official repository.
# The resulting image is tagged with main and latest.
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -44,7 +36,7 @@ jobs:
tags: ntnn/imapfilter:main,ntnn/imapfilter:latest
# Only push when building main
push: ${{ github.ref == 'refs/heads/main' }}
platforms: ${{ matrix.platforms }}
platforms: linux/amd64,linux/arm64,linux/arm/v7

- id: imapfilter-latest-tag
run: |
Expand All @@ -60,6 +52,6 @@ jobs:
tags: ntnn/imapfilter:latest-tag,ntnn/imapfilter:${{ steps.imapfilter-latest-tag.outputs.tag }}
# Only push when building main
push: ${{ github.ref == 'refs/heads/main' }}
platforms: ${{ matrix.platforms }}
platforms: linux/amd64,linux/arm64,linux/arm/v7
build-args: |
imapfilter_spec=${{ steps.imapfilter-latest-tag.outputs.tag }}

0 comments on commit 8bc6fef

Please sign in to comment.