From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 30 Mar 2022 11:40:10 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=51a297e1287a9b2dd3b2d2b19433820e996779db;p=mastodon.git

Merge branch 'main' into glitch-soc/merge-upstream
---

51a297e1287a9b2dd3b2d2b19433820e996779db
diff --cc .github/workflows/build-image.yml
index 880fdfac9,0fa28aca1..b3a8d5105
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -36,8 -38,8 +39,8 @@@ jobs
        - uses: docker/build-push-action@v2
          with:
            context: .
-           platforms: linux/amd64,linux/arm64
+           platforms: ${{ matrix.os }}
            push: ${{ github.event_name != 'pull_request' }}
            tags: ${{ steps.meta.outputs.tags }}
 -          cache-from: type=registry,ref=tootsuite/mastodon:latest
 +          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest
            cache-to: type=inline