Revert "Split build image actions (#17793)" (#17907)

This reverts commit 22eeaf2645.
This commit is contained in:
Eugen Rochko 2022-03-30 14:34:53 +02:00 committed by GitHub
parent 2cc7ba2671
commit 607ce67e05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,9 +13,6 @@ on:
jobs: jobs:
build-image: build-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
os: [linux/arm64, linux/amd64]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: docker/setup-qemu-action@v1 - uses: docker/setup-qemu-action@v1
@ -38,7 +35,7 @@ jobs:
- uses: docker/build-push-action@v2 - uses: docker/build-push-action@v2
with: with:
context: . context: .
platforms: ${{ matrix.os }} platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
cache-from: type=registry,ref=tootsuite/mastodon:latest cache-from: type=registry,ref=tootsuite/mastodon:latest