From f7a3f0e921706a4f06b3c2df37bd87af36e4c830 Mon Sep 17 00:00:00 2001
From: Geoff Lee <Vritra@hitel.net>
Date: Thu, 7 Nov 2024 16:38:41 +0900
Subject: [PATCH] chore: remove subdirectory in linux releases (#300)

* remove subdirectory in linux releases

* fix typo
---
 .github/workflows/build-linux-amd64.yml | 26 ++++++++++++-------------
 .github/workflows/build-linux-arm64.yml | 17 +++++-----------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-linux-amd64.yml b/.github/workflows/build-linux-amd64.yml
index 8932a839..8481f3fc 100644
--- a/.github/workflows/build-linux-amd64.yml
+++ b/.github/workflows/build-linux-amd64.yml
@@ -37,31 +37,29 @@ jobs:
           export GOARCH=${GOARCH}
           export GOOS=${GOOS}
           make build-linux-with-shared-library
-          pushd build
-          mkdir -p initia_${VERSION}
-          mv libmovevm.so initia_${VERSION}/libmovevm.${ARCH_NAME}.so
-          mv libcompiler.so initia_${VERSION}/libcompiler.${ARCH_NAME}.so
-          mv initiad initia_${VERSION}/
-          tar -czvf initia_${VERSION}_Linux_${ARCH_NAME}.tar.gz initia_${VERSION}
-          popd
+          mkdir -p release-${GOOS}-${ARCH_NAME}
+          mv ./build/libmovevm.so ./release-${GOOS}-${ARCH_NAME}/libmovevm.${ARCH_NAME}.so
+          mv ./build/libcompiler.so ./release-${GOOS}-${ARCH_NAME}/libcompiler.${ARCH_NAME}.so
+          mv ./build/initiad ./release-${GOOS}-${ARCH_NAME}/initiad
+          tar -czvf initia_${VERSION}_Linux_${ARCH_NAME}.tar.gz -C release-${GOOS}-${ARCH_NAME} initiad libmovevm.${ARCH_NAME}.so libcompiler.${ARCH_NAME}.so
+          make clean
 
       - name: Static Build for Linux AMD64
         run: |
           export GOARCH=${GOARCH}
           export GOOS=${GOOS}
           make build-linux
-          pushd build
-          mkdir -p initia_${VERSION}_static
-          mv initiad initia_${VERSION}_static/
-          tar -czvf initia_${VERSION}_Linux_${ARCH_NAME}_static.tar.gz initia_${VERSION}_static
-          popd
+          mkdir -p release-${GOOS}-${ARCH_NAME}-static
+          mv ./build/initiad ./release-${GOOS}-${ARCH_NAME}-static/initiad
+          tar -czvf initia_${VERSION}_Linux_${ARCH_NAME}_static.tar.gz -C release-${GOOS}-${ARCH_NAME}-static initiad
+          make clean
 
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            ./build/initia_${{ env.VERSION }}_Linux_${{ env.ARCH_NAME }}.tar.gz
-            ./build/initia_${{ env.VERSION }}_Linux_${{ env.ARCH_NAME }}_static.tar.gz
+            ./initia_${{ env.VERSION }}_Linux_${{ env.ARCH_NAME }}.tar.gz
+            ./initia_${{ env.VERSION }}_Linux_${{ env.ARCH_NAME }}_static.tar.gz
         env:
           Version: ${{ env.VERSION }}
           ARCH_NAME: ${{ env.ARCH_NAME }}
diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml
index dc8e8c0a..ba5d8d38 100644
--- a/.github/workflows/build-linux-arm64.yml
+++ b/.github/workflows/build-linux-arm64.yml
@@ -52,18 +52,11 @@ jobs:
           docker rm temp
 
           # Package the artifacts
-          cd ./build
-          mkdir -p initia_${VERSION}
-          mv initiad initia_${VERSION}/
-          mv libmovevm.so initia_${VERSION}/libmovevm.${ARCH_NAME}.so
-          mv libcompiler.so initia_${VERSION}/libcompiler.${ARCH_NAME}.so
-          tar -czvf initia_${VERSION}_Linux_${ARCH_NAME}.tar.gz initia_${VERSION}
-          mv initia_${VERSION}_Linux_${ARCH_NAME}.tar.gz ../
-
-          # Check the build result
-          cd ..
-          ls -l
-          file initia_${VERSION}_Linux_${ARCH_NAME}.tar.gz
+          mkdir -p release-${GOOS}-${ARCH_NAME}
+          mv ./build/initiad ./release-${GOOS}-${ARCH_NAME}/initiad
+          mv ./build/libmovevm.so ./release-${GOOS}-${ARCH_NAME}/libmovevm.${ARCH_NAME}.so
+          mv ./build/libcompiler.so  ./release-${GOOS}-${ARCH_NAME}/libcompiler.${ARCH_NAME}.so
+          tar -czvf initia_${VERSION}_Linux_${ARCH_NAME}.tar.gz -C ./release-${GOOS}-${ARCH_NAME} initiad libmovevm.${ARCH_NAME}.so libcompiler.${ARCH_NAME}.so
 
           # Remove the builder
           docker buildx rm arm64-builder