From b7e2ce36932ca2982799b1d2c061e2ad85f9ab59 Mon Sep 17 00:00:00 2001
From: Donghee Na <donghee.na@python.org>
Date: Mon, 20 Jan 2025 22:29:42 +0900
Subject: [PATCH 1/3] Revert ".github: Fix manifest step"

This reverts commit fb11d88de73cf7dbcf2eba8783827f38ee3155be.
---
 .github/workflows/release.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c7f31ef..b264a65 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -90,23 +90,15 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pull images
-        run: |
-          docker pull ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64
-          docker tag ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 ghcr.io/python/${{ inputs.package }}:amd64
-
-          docker pull ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
-          docker tag ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64 ghcr.io/python/${{ inputs.package }}:arm64
-
       - name: Set manifest
         run: |
           docker manifest create ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }} \
-              ghcr.io/python/${{ inputs.package }}:amd64 \
-              ghcr.io/python/${{ inputs.package }}:arm64
+              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
+              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
 
           docker manifest create ghcr.io/python/${{ inputs.package }}:latest \
-              ghcr.io/python/${{ inputs.package }}:amd64 \
-              ghcr.io/python/${{ inputs.package }}:arm64
+              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
+              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
 
           docker manifest push ghcr.io/python/${{ inputs.package }}:latest
           docker manifest push ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}

From 351e429de268e68d4478f8d9ab8aa3e3be910001 Mon Sep 17 00:00:00 2001
From: Donghee Na <donghee.na@python.org>
Date: Mon, 20 Jan 2025 22:30:22 +0900
Subject: [PATCH 2/3] Revert ".github: Fix manifest issue"

This reverts commit 21e44f99e9dbd993a1ba9cd56fdbc7b7fb33318a.
---
 .github/workflows/release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b264a65..390e709 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,12 +93,12 @@ jobs:
       - name: Set manifest
         run: |
           docker manifest create ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }} \
-              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
-              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
+              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
+              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
 
           docker manifest create ghcr.io/python/${{ inputs.package }}:latest \
-              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
-              ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
+              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
+              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
 
           docker manifest push ghcr.io/python/${{ inputs.package }}:latest
           docker manifest push ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}

From 7d135c275e96e5ba2b8b6ad0670c2e75e8c96cca Mon Sep 17 00:00:00 2001
From: Donghee Na <donghee.na@python.org>
Date: Mon, 20 Jan 2025 22:33:41 +0900
Subject: [PATCH 3/3] .github: Revert release.yml

---
 .github/workflows/release.yml | 68 ++++-------------------------------
 1 file changed, 7 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 390e709..4a36093 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,27 +15,22 @@ on:
 run-name: "Release: ${{ inputs.package }}"
 
 jobs:
-  generate-version:
+  release-to-ghcr:
     concurrency:
       group: release-to-ghcr-${{ inputs.package }}
       cancel-in-progress: false
     if: contains('["brettcannon", "corona10", "erlend-aasland"]', github.actor)
     runs-on: ubuntu-latest
-    outputs:
-      builddate: ${{ steps.version.outputs.builddate }}
     steps:
       # Checkout push-to-registry action github repository
       - name: Set Calver Date
         run: |
           echo "builddate=$(date +'%Y.%m.%d')" >> $GITHUB_OUTPUT
         id: version
-
-  build_amd64:
-    needs: generate-version
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
+      - name: Checkout Push to Registry action
         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 GHCR
@@ -48,57 +43,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./${{ inputs.package }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64
-
-  build_arm64:
-    needs: generate-version
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login To GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./${{ inputs.package }}
-          platforms: linux/arm64
-          push: true
-          tags: |
-            ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
-
-  set_manifest:
-    needs: [generate-version, build_amd64, build_arm64]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login To GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set manifest
-        run: |
-          docker manifest create ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }} \
-              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
-              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
-
-          docker manifest create ghcr.io/python/${{ inputs.package }}:latest \
-              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 \
-              --amend ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64
-
-          docker manifest push ghcr.io/python/${{ inputs.package }}:latest
-          docker manifest push ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}
+            ghcr.io/python/${{ inputs.package }}:${{ steps.version.outputs.builddate }}.${{ github.run_id }}
+            ghcr.io/python/${{ inputs.package }}:latest