1

SoftFever · Oct 8, 2023 · 8a83ca7 · 8a83ca7
1 parent 12d8b11
commit 8a83ca7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml
@@ -126,5 +126,5 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_dep_ubuntu_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build/destdir
+          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
 
diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml
@@ -93,11 +93,11 @@ jobs:
         if: matrix.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-          curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_mac_${{matrix.arch}}_07-10-2023.tar.gz
-          tar -zxf ./OrcaSlicer_dep_mac_${{matrix.arch}}_07-10-2023.tar.gz -C ${{ github.workspace }}/deps/build_${{matrix.arch}}
-          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_${{matrix.arch}}/OrcaSlicer_dep_${{matrix.arch}}
-          ls -l ${{ github.workspace }}/deps/build_${{matrix.arch}}/OrcaSlicer_dep_${{matrix.arch}}
-          rm ./OrcaSlicer_dep_mac_${{matrix.arch}}_07-10-2023.tar.gz
+          curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz
+          tar -zxf ./OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz -C ${{ github.workspace }}/deps/build_${{matrix.arch}}
+          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_${{matrix.arch}}
+          ls -l ${{ github.workspace }}/deps/build_${{matrix.arch}}
+          rm ./OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz
 
 
       - name: Build slicer mac
@@ -160,7 +160,7 @@ jobs:
       - name: download deps
         if: matrix.os == 'windows-latest'
         shell: powershell
-        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_win64_20231007.zip", "$env:temp\OrcaSlicer_dep_win64_20231007.zip")'
+        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_win64_20230810_vs2022.zip", "$env:temp\OrcaSlicer_dep_win64_20230810_vs2022.zip")'
 
       - name: maker dir
         if: matrix.os == 'windows-latest'
@@ -171,9 +171,9 @@ jobs:
 
       - name: extract deps
         if: matrix.os == 'windows-latest'
-        working-directory: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+        working-directory: ${{ github.workspace }}/deps/build
         shell: cmd
-        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_win64_20231007.zip'
+        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_win64_20230810_vs2022.zip'
 
       # - name: build deps
         # if: matrix.os == 'windows-latest'
@@ -265,11 +265,11 @@ jobs:
         run: |
           mkdir -p ${{ github.workspace }}/deps/build
           mkdir -p ${{ github.workspace }}/deps/build/destdir
-          curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_ubuntu_20231007.zip
-          unzip ./OrcaSlicer_dep_ubuntu_20231007.zip -d ${{ github.workspace }}/deps/build/destdir
+          curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_ubuntu_20231008.zip
+          unzip ./OrcaSlicer_dep_ubuntu_20231008.zip -d ${{ github.workspace }}/deps/build/destdir
           chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/destdir
           ls -l ${{ github.workspace }}/deps/build/destdir
-          rm OrcaSlicer_dep_ubuntu_20231007.zip
+          rm OrcaSlicer_dep_ubuntu_20231008.zip
 
 
       - name: Build slicer

diff --git a/build_release_macos.sh b/build_release_macos.sh
@@ -62,7 +62,7 @@ then
     cmake --build . --config Release --target deps 
     if [ "1." == "$PACK_DEPS". ];
     then
-        tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%d-%m-%Y").tar.gz OrcaSlicer_dep_$ARCH
+        tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz OrcaSlicer_dep_$ARCH
     fi
 fi