From 60e075db41e44bf5b644e0462e7e442c1b3b633a Mon Sep 17 00:00:00 2001
From: Deshi Xiao <xiaods@gmail.com>
Date: Sun, 27 Feb 2022 14:05:25 +0800
Subject: [PATCH] Update github action scripts for upload files

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
---
 .github/workflows/release.yml | 10 +++++-----
 hack/package-airgap.sh        | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b8899fd40..1f9dbd8aa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,12 +32,12 @@ jobs:
     - uses: MCJack123/ghaction-generate-release-hashes@v1
       with:
         hash-type: sha256
-        file-name: dist/artifacts/k8e-hashes.txt
+        file-name: k8e-hashes.txt
     - name: Uploading assets...
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          dist/artifacts/k8e-${{ matrix.goarch }}
-          dist/artifacts/k8e-airgap-images-${{ matrix.goarch }}.tar.gz
-          dist/artifacts/k8e-images-${{ matrix.goarch }}.txt
-          dist/artifacts/k8e-hashes.txt
\ No newline at end of file
+          dist/artifacts/k8e
+          dist/artifacts/k8e-airgap-images.tar.gz
+          dist/artifacts/k8e-images.txt
+          k8e-hashes.txt
\ No newline at end of file
diff --git a/hack/package-airgap.sh b/hack/package-airgap.sh
index 9b897696a..83a582c13 100755
--- a/hack/package-airgap.sh
+++ b/hack/package-airgap.sh
@@ -5,13 +5,16 @@ cd $(dirname $0)/..
 
 . ./hack/version.sh
 
+BIN_SUFFIX="-${ARCH}"
+if [ ${ARCH} = amd64 ]; then
+    BIN_SUFFIX=""
+elif [ ${ARCH} = aarch64 ] || [ ${ARCH} = arm64 ]; then
+    BIN_SUFFIX="-arm64"
+fi
+
 airgap_image_file='hack/airgap/image-list.txt'
 images=$(cat "${airgap_image_file}")
 xargs -n1 docker pull <<< "${images}"
-docker save ${images} -o dist/artifacts/k8e-airgap-images-${ARCH}.tar
-gzip -v -c dist/artifacts/k8e-airgap-images-${ARCH}.tar > dist/artifacts/k8e-airgap-images-${ARCH}.tar.gz
-if [ ${ARCH} = amd64 ]; then
-  cp "${airgap_image_file}" dist/artifacts/k8e-images.txt
-elif [ ${ARCH} = aarch64 ] || [ ${ARCH} = arm64 ]; then
-    cp "${airgap_image_file}" dist/artifacts/k8e-images-arm64.txt
-fi
\ No newline at end of file
+docker save ${images} -o dist/artifacts/k8e-airgap-images${BIN_SUFFIX}.tar
+gzip -v -c dist/artifacts/k8e-airgap-images${BIN_SUFFIX}.tar > dist/artifacts/k8e-airgap-images${BIN_SUFFIX}.tar.gz
+cp "${airgap_image_file}" dist/artifacts/k8e-images${BIN_SUFFIX}.txt
\ No newline at end of file