ci: fix arm64 (#105)

Signed-off-by: Jack Yu <jack.yu@suse.com>
rancher · Apr 10, 2024 · 9565f65 · 9565f65
1 parent 2893ddb
commit 9565f65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -7,6 +7,6 @@ jobs:
   call-dapper-build:
     uses: ./.github/workflows/template-build.yml
     with:
-      release-tag-name: ${{ github.ref_name }}-head
+      release-tag-name: pull-${{ github.event.number }}
       push: false
     secrets: inherit
diff --git a/.github/workflows/template-build.yml b/.github/workflows/template-build.yml
@@ -25,7 +25,7 @@ jobs:
         run: apk add -U git
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Get Arch
         id: get-arch
@@ -49,19 +49,18 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Docker Publish
+      - name: Docker Build
         uses: docker/build-push-action@v5
-        if: ${{ inputs.push == true }}
         with:
           provenance: false
           context: .
           platforms: ${{ matrix.platform }}
           file: package/Dockerfile
-          push: true
+          push: ${{ inputs.push }}
           tags: rancher/support-bundle-kit:${{ inputs.release-tag-name }}-${{ steps.get-arch.outputs.ARCH }}
-        env:
-          ARCH: ${{ steps.get-arch.outputs.ARCH }}
-          VERSION: ${{ github.ref_name }}-${{ github.sha }}-head
+          build-args: |
+            ARCH=${{ steps.get-arch.outputs.ARCH }}
+            VERSION=${{ github.ref_name }}-${{ github.sha }}-head
 
   manifest:
     if: ${{ inputs.push == true }}