From ec4a1525ee7f0daf05a2ab709123fbb0fe69e4e2 Mon Sep 17 00:00:00 2001
From: Cooper Lees <me@cooperlees.com>
Date: Sun, 19 Nov 2023 11:28:00 -0800
Subject: [PATCH] [docker ci] Revert "parallel" builds in seperate actions
 (#4057)

- Broke tagging images together
- Saved only a few mins
  - x86_64 build is fast, time is all spent on cross compile of arm64
- Also remove evil copy pasta ... which is nice

Was worth an attempt.
---
 .../{docker_amd64.yml => docker.yml}          |  8 +--
 .github/workflows/docker_arm64.yml            | 69 -------------------
 2 files changed, 4 insertions(+), 73 deletions(-)
 rename .github/workflows/{docker_amd64.yml => docker.yml} (92%)
 delete mode 100644 .github/workflows/docker_arm64.yml

diff --git a/.github/workflows/docker_amd64.yml b/.github/workflows/docker.yml
similarity index 92%
rename from .github/workflows/docker_amd64.yml
rename to .github/workflows/docker.yml
index 846cd8c..ee85823 100644
--- a/.github/workflows/docker_amd64.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: docker amd64 (x86_64)
+name: docker
 
 on:
   push:
@@ -39,7 +39,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: pyfound/black:latest,pyfound/black:${{ env.GIT_TAG }}
 
@@ -50,7 +50,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: pyfound/black:latest_release
 
@@ -61,7 +61,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: pyfound/black:latest_prerelease
 
diff --git a/.github/workflows/docker_arm64.yml b/.github/workflows/docker_arm64.yml
deleted file mode 100644
index ddd5541..0000000
--- a/.github/workflows/docker_arm64.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: docker arm64
-
-on:
-  push:
-    branches:
-      - "main"
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-jobs:
-  docker:
-    if: github.repository == 'psf/black'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Check + set version tag
-        run:
-          echo "GIT_TAG=$(git describe --candidates=0 --tags 2> /dev/null || echo
-          latest_non_release)" >> $GITHUB_ENV
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: pyfound/black:latest,pyfound/black:${{ env.GIT_TAG }}
-
-      - name: Build and push latest_release tag
-        if:
-          ${{ github.event_name == 'release' && github.event.action == 'published' &&
-          !github.event.release.prerelease }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: pyfound/black:latest_release
-
-      - name: Build and push latest_prerelease tag
-        if:
-          ${{ github.event_name == 'release' && github.event.action == 'published' &&
-          github.event.release.prerelease }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: pyfound/black:latest_prerelease
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}