From c2827e316155b354de95ad0f2c4284e2953a9809 Mon Sep 17 00:00:00 2001
From: SoftFever <softfeverever@gmail.com>
Date: Thu, 16 Mar 2023 01:29:29 +0800
Subject: [PATCH] CICD: was uploading wrong zip file

---
 .github/workflows/build_mac_arm64.yml |  4 ++--
 .github/workflows/build_mac_x64.yml   |  4 ++--
 build_release_macos.sh                | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml
index 57a6481da7..d947917df0 100644
--- a/.github/workflows/build_mac_arm64.yml
+++ b/.github/workflows/build_mac_arm64.yml
@@ -72,7 +72,7 @@ jobs:
       - name: pack app
         working-directory: ${{ github.workspace }}
         run: |
-          export ver=$(grep '^#define SoftFever_VERSION' ./src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+          export ver=$(grep '^#define SoftFever_VERSION' ./build_arm64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
           ver="_V${ver//\"}"
           zip -FSr OrcaSlicer${ver}_nightly_Mac_AppleSilicon.zip ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer.app
 
@@ -89,4 +89,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Mac_AppleSilicon
-          path: ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer*.zip
\ No newline at end of file
+          path: ${{ github.workspace }}/OrcaSlicer*.zip
\ No newline at end of file
diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml
index dc56b40007..3c2570ca22 100644
--- a/.github/workflows/build_mac_x64.yml
+++ b/.github/workflows/build_mac_x64.yml
@@ -73,7 +73,7 @@ jobs:
       - name: pack app
         working-directory: ${{ github.workspace }}
         run: |
-          export ver=$(grep '^#define SoftFever_VERSION' ./src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+          export ver=$(grep '^#define SoftFever_VERSION' ./build_x86_64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
           ver="_V${ver//\"}"
           zip -FSr OrcaSlicer${ver}_nightly_Mac_Intel.zip ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer.app
 
@@ -90,4 +90,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Mac_Intel
-          path: ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer*.zip
\ No newline at end of file
+          path: ${{ github.workspace }}/OrcaSlicer*.zip
\ No newline at end of file
diff --git a/build_release_macos.sh b/build_release_macos.sh
index 83262c827d..7bffb30b48 100755
--- a/build_release_macos.sh
+++ b/build_release_macos.sh
@@ -88,13 +88,13 @@ cp -R $resources_path ./OrcaSlicer.app/Contents/Resources
 # delete .DS_Store file
 find ./OrcaSlicer.app/ -name '.DS_Store' -delete
 # extract version
-export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
-ver="_V${ver//\"}"
-echo $PWD
-if [ "1." != "$NIGHTLY_BUILD". ];
-then
-    ver=${ver}_dev
-fi
+# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+# ver="_V${ver//\"}"
+# echo $PWD
+# if [ "1." != "$NIGHTLY_BUILD". ];
+# then
+#     ver=${ver}_dev
+# fi
 
 
-zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
+# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app