From e1f099bfd5abb160a83ab847c314838bd608cd85 Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Thu, 31 Oct 2024 00:00:17 +0800
Subject: [PATCH] fix: remove duplicate build-steps/action.yml

Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
---
 .github/actions/build-steps/action.yml | 76 --------------------------
 .github/workflows/build-steps.yml      | 14 +++--
 .github/workflows/push-image.yml       |  2 +-
 3 files changed, 9 insertions(+), 83 deletions(-)
 delete mode 100644 .github/actions/build-steps/action.yml

diff --git a/.github/actions/build-steps/action.yml b/.github/actions/build-steps/action.yml
deleted file mode 100644
index 8cd5c2f1d..000000000
--- a/.github/actions/build-steps/action.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Build Steps
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      platform_pair:
-        required: true
-        type: string
-      registry_image:
-        required: true
-        type: string
-      runtime:
-        required: true
-        type: string
-      buildpack:
-        required: true
-        type: string
-      runs_on:
-        required: true
-        type: string
-
-jobs:
-  build:
-    runs-on: ${{ inputs.runs_on }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ inputs.registry_image }}
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./deployments/Dockerfile
-          platforms: ${{ inputs.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ inputs.registry_image }},push-by-digest=true,name-canonical=true,push=true
-          build-args: |
-            RUNTIME=${{ inputs.runtime }}
-            BUILDPACK=${{ inputs.buildpack }}
-      -
-        name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-      -
-        name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ inputs.platform_pair }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
diff --git a/.github/workflows/build-steps.yml b/.github/workflows/build-steps.yml
index 7d8804abe..8cd5c2f1d 100644
--- a/.github/workflows/build-steps.yml
+++ b/.github/workflows/build-steps.yml
@@ -6,6 +6,9 @@ on:
       platform:
         required: true
         type: string
+      platform_pair:
+        required: true
+        type: string
       registry_image:
         required: true
         type: string
@@ -15,15 +18,14 @@ on:
       buildpack:
         required: true
         type: string
+      runs_on:
+        required: true
+        type: string
 
 jobs:
   build:
+    runs-on: ${{ inputs.runs_on }}
     steps:
-      -
-        name: Prepare Platform Environment
-        run: |
-          platform=${{ inputs.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       -
         name: Checkout
         uses: actions/checkout@v4
@@ -68,7 +70,7 @@ jobs:
         name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ env.PLATFORM_PAIR }}
+          name: digests-${{ inputs.platform_pair }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index cb528a0f7..2b63cc6bc 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -15,7 +15,7 @@ on:
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
       registry_image:
         description: 'image name'
-        required: false
+        required: true
         default: 'hackmdio/hackmd'
 
 jobs: