double zip to maybe upload libstdc++

neutronimaging · Jan 7, 2025 · 4b056e0 · 4b056e0
1 parent 2eeb340
commit 4b056e0
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/.github/workflows/Build-multi-OS.yml b/.github/workflows/Build-multi-OS.yml
@@ -190,19 +190,19 @@ jobs:
         name: ${{runner.os}}-${{runner.arch}}-test-results
         path: ${{ matrix.build_root }}/Testing
 
-    # - name: Compress artifact
-    #   shell: bash
-    #   working-directory: ${{ matrix.build_root }}
-    #   run: |
-    #     if [ "${RUNNER_OS}" == "Windows" ]; then
-    #       7z a ../MuhRec-${{runner.os}}-${{runner.arch}}.zip "bin/Release/*" -xr!t*.exe -xr!muhreccli.exe -xr!verticalslicer.exe
-    #     elif [ "${RUNNER_OS}" == "Linux" ]; then
-    #       zip -r ../../MuhRec-${{runner.os}}-${{runner.arch}}.zip bin/* lib/* -x "bin/t*" -x "bin/verticalslicer" 
-    #     elif [ "${RUNNER_OS}" == "macOS" -a "${RUNNER_ARCH}" == "X64" ]; then
-    #       zip -r ../../MuhRec-${{runner.os}}-${{runner.arch}}.zip lib/* *.app/* -x "lib/*.dylib"
-    #     elif [ "${RUNNER_OS}" == "macOS" -a "${RUNNER_ARCH}" == "ARM64" ]; then
-    #       zip -r ../../MuhRec-${{runner.os}}-${{runner.arch}}.zip lib/* *.app/* -x "lib/*.dylib" -x "lib/*.h"
-    #     fi
+    - name: Compress artifact
+      shell: bash
+      working-directory: ${{ matrix.build_root }}
+      run: |
+        if [ "${RUNNER_OS}" == "Windows" ]; then
+          7z a ../MuhRec-${{runner.os}}-${{runner.arch}}.zip "bin/Release/*" -xr!t*.exe -xr!.pyd
+        elif [ "${RUNNER_OS}" == "Linux" ]; then
+          zip -r ../../MuhRec-${{runner.os}}-${{runner.arch}}.zip bin/* lib/* -x "bin/t*" -x "bin/verticalslicer" 
+        elif [ "${RUNNER_OS}" == "macOS" -a "${RUNNER_ARCH}" == "X64" ]; then
+          zip -r ../../MuhRec-${{runner.os}}-${{runner.arch}}.zip lib/* *.app/* -x "lib/*.dylib"
+        elif [ "${RUNNER_OS}" == "macOS" -a "${RUNNER_ARCH}" == "ARM64" ]; then
+          zip -r ../../MuhRec-${{runner.os}}-${{runner.arch}}.zip lib/* *.app/* -x "lib/*.dylib" -x "lib/*.h"
+        fi
 
     - name: Save build artifact Windows
       if: ${{ runner.os == 'Windows' }}
@@ -219,9 +219,8 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: MuhRec-${{runner.os}}-${{runner.arch}}
-        include-hidden-files: true
         path: |
-          ${{ matrix.build_root }}
+           "${{ github.workspace }}/MuhRec*.zip"
         #  ${{ matrix.build_root }}/bin/*
         #  !${{ matrix.build_root }}/bin/t*
         #  ${{ matrix.build_root }}/PlugIns/*