diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index a8f011329..61a6ecbc2 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -59,11 +59,12 @@ jobs: run: | cp -f src/slic3r++ Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++ chmod u+x Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++ - tar -zcvf slic3r++.tar.gz Slic3r++ + tar -cvf slic3r++.tar Slic3r++ - name: create dmg working-directory: ./build run: | - hdiutil create -ov -format UDZO -volname "Slic3rPP" -srcfolder "Slic3r++" Slic3r++.dmg + hdiutil create -ov -fs HFS+ -volname "Slic3r++" -srcfolder "Slic3r++" temp.dmg + hdiutil convert temp.dmg -format UDZO -o Slic3r++.dmg # - name: signing resources (creating CodeResources inside _CodeSignature) # working-directory: . # run: codesign -s resources @@ -71,10 +72,10 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: - name: nightly_macos_targz - path: build/slic3r++.tar.gz + name: nightly_macos.tar + path: build/slic3r++.tar - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: - name: nightly_macos + name: nightly_macos.dmg path: build/Slic3r++.dmg diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 8b92bbb6b..02213294a 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -14,10 +14,10 @@ jobs: - uses: actions/checkout@v1 - name: change date in version run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - - name: update apt - run: sudo apt update - name: update clock run: sudo hwclock -s + - name: update apt + run: sudo apt update - name: install gtk2 glew run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev - name: mkdir in deps @@ -55,9 +55,9 @@ jobs: run: | echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/slic3r++" "$@"' >slic3r++ chmod u+x slic3r++ - tar -zcvf ../slic3r++.tar.gz . + tar -cvf ../slic3r++.tar . - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: nightly_linux - path: build/slic3r++.tar.gz + path: build/slic3r++.tar