🚀 add cpu arch

XDSEC · Apr 8, 2024 · 8ea43fe · 8ea43fe
1 parent af6a111
commit 8ea43fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -110,8 +110,8 @@
         - name: Upload application ZIP
           uses: actions/upload-artifact@v4
           with:
-            name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
-            path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
+            name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-x86_64.zip
+            path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-x86_64.zip
 
     ## macOS build ###############################################################
     build-mac-arm:
@@ -155,8 +155,8 @@
         - name: Upload application ZIP
           uses: actions/upload-artifact@v4
           with:
-            name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
-            path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
+            name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-arm64.zip
+            path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-arm64.zip
 
     ## Windows build #############################################################
     build-windows:

diff --git a/deploy_macos.sh b/deploy_macos.sh
@@ -57,6 +57,8 @@ install -D ./build/bin/wsrx-desktop "${APP_ROOT}/wsrx-desktop"
 
 ## DEPLOY ######################################################################
 
+CPU_ARCH=$(uname -m)
+
 if [[ $use_contribs = true ]] ; then
   export LD_LIBRARY_PATH=$(pwd)/contribs/src/env/macOS_x86_64/usr/lib/
 else
@@ -76,14 +78,14 @@ cd ..
 if [[ $create_package = true ]] ; then
   echo '---- Compressing package'
   cd $APP_ROOT
-  zip -r -y -X ../$APP_NAME-$APP_VERSION-macos.zip $APP_NAME.app
+  zip -r -y -X ../$APP_NAME-$APP_VERSION-macOS-$CPU_ARCH.zip $APP_NAME.app
   cd ..
 fi
 
 ## UPLOAD ######################################################################
 
 if [[ $upload_package = true ]] ; then
   printf "---- Uploading to transfer.sh"
-  curl --upload-file $APP_NAME*.zip https://transfer.sh/$APP_NAME.$APP_VERSION-git$GIT_VERSION-macOS.zip
+  curl --upload-file $APP_NAME*.zip https://transfer.sh/$APP_NAME.$APP_VERSION-git$GIT_VERSION-macOS-$CPU_ARCH.zip
   printf "\n"
 fi