From c1f1e0ee7c20f7ff31bce940adba37303fdf3987 Mon Sep 17 00:00:00 2001
From: "Kohei Ota (inductor)" <kela@inductor.me>
Date: Tue, 14 Feb 2023 15:00:50 +0900
Subject: [PATCH] Revert "attempt matrix build (#9927)" (#9930)

This reverts commit 192ea9738d84c9b65613f38cce024325b9b8c819.
---
 .github/workflows/docker-develop.yml | 7 ++-----
 .github/workflows/docker.yml         | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index d0715f2e0a..09a2c33e0c 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -11,9 +11,6 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     if: github.repository == 'misskey-dev/misskey'
-    strategy:
-      matrix:
-        arch: [linux/amd64, linux/arm64]
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
@@ -21,7 +18,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2.3.0
         with:
-          platforms: ${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -38,7 +35,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
-          platforms: ${{ matrix.arch }}
+          platforms: ${{ steps.buildx.outputs.platforms }}
           provenance: false
           tags: misskey/misskey:develop
           labels: develop
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e4440303d8..a465d92eaf 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,9 +9,7 @@ jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [linux/amd64, linux/arm64]
+
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
@@ -19,7 +17,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2.3.0
         with:
-          platforms: ${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -43,7 +41,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
-          platforms: ${{ matrix.arch }}
+          platforms: ${{ steps.buildx.outputs.platforms }}
           provenance: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}