From 1f00fe92d20667683d33f8564fbdf0e0506add32 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Wed, 24 Jan 2024 19:31:18 +0800 Subject: [PATCH] nightly release (#3792) * nightly release --- .github/workflows/build_orca.yml | 48 +++++++++++++++++++++++-- CMakeLists.txt | 2 +- README.md | 33 +++++++++++------ src/platform/unix/BuildLinuxImage.sh.in | 2 +- src/platform/unix/build_appimage.sh.in | 2 +- 5 files changed, 72 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 1e8962d80ea..d6bd6c25f67 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -130,6 +130,17 @@ jobs: name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg + - name: Deploy Mac release + if: github.ref == 'refs/heads/main' && inputs.os == 'macos-12' + uses: WebFreak001/deploy-nightly@v3.0.0 + with: + upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} + release_id: 137995723 + asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg + asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg + asset_content_type: application/octet-stream + max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted + # Windows - name: setup MSVC if: inputs.os == 'windows-latest' @@ -185,6 +196,28 @@ jobs: name: PDB path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z + - name: Deploy Windows release portable + if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' + uses: WebFreak001/deploy-nightly@v3.0.0 + with: + upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} + release_id: 137995723 + asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip + asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip + asset_content_type: application/x-zip-compressed + max_releases: 1 + + - name: Deploy Windows release installer + if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' + uses: WebFreak001/deploy-nightly@v3.0.0 + with: + upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} + release_id: 137995723 + asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe + asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe + asset_content_type: application/x-msdownload + max_releases: 1 + # Ubuntu - name: Install dependencies if: inputs.os == 'ubuntu-20.04' @@ -211,11 +244,22 @@ jobs: shell: bash run: | ./BuildLinux.sh -isr - chmod +x ./build/OrcaSlicer_ubu64.AppImage + chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage - name: Upload artifacts Ubuntu if: inputs.os == 'ubuntu-20.04' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_Linux_${{ env.ver }} - path: './build/OrcaSlicer_ubu64.AppImage' + path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage' + + - name: Deploy Ubuntu release + if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' + uses: WebFreak001/deploy-nightly@v3.0.0 + with: + upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} + release_id: 137995723 + asset_path: ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage + asset_name: OrcaSlicer_Linux_${{ env.ver }}.AppImage + asset_content_type: application/octet-stream + max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted diff --git a/CMakeLists.txt b/CMakeLists.txt index 4640034c41d..190e9e0bdcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -772,7 +772,7 @@ set (CPACK_PACKAGE_VENDOR "SoftFever") set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}") set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}") set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}") -set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_${SoftFever_VERSION}") +set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers") set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer") set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) diff --git a/README.md b/README.md index 6a11fd1ecb7..f37d5a2d03f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml) # Orca Slicer Orca Slicer is an open source slicer for FDM printers. -You can download Orca Slicer here: [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/). + ![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/P4VE9UY9gJ) # Main features @@ -13,22 +13,27 @@ You can download Orca Slicer here: [github releases page](https://github.com/Sof - More granular controls - More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/) -### Some background -OrcaSlicer is fork of Bambu Studio -It was previously known as BambuStudio-SoftFever -Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. -Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill -Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr) + +# Download + +### Stable Release +📥 **[Download the Latest Stable Release](https://github.com/SoftFever/OrcaSlicer/releases/latest)** +Visit our GitHub Releases page for the latest stable version of Orca Slicer, recommended for most users. + +### Nightly Builds +🌙 **[Download the Latest Nightly Build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds)** +Explore the latest developments in Orca Slicer with our nightly builds. Feedback on these versions is highly appreciated. + # How to install **Windows**: 1. Download the installer for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases). - *For convenience there is also a portable build available.* - *If you have troubles to run the build, you might need to install following runtimes:* - - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe) + - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe) - [Details of this runtime](https://aka.ms/webview2) - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703) - - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe) + - [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe) - [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe) - This file may already be available on your computer if you've installed visual studio. Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142` @@ -55,7 +60,7 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr **Linux(Ubuntu)**: 1. If you run into trouble to execute it, try this command in terminal: - `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage` + `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage` # How to compile - Windows 64-bit @@ -126,6 +131,14 @@ Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/wiki/Or Support me [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP) +## Some background +OrcaSlicer is originaly forked from Bambu Studio, it was previously known as BambuStudio-SoftFever. + +Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. +Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill +Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr) + + # License Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab. diff --git a/src/platform/unix/BuildLinuxImage.sh.in b/src/platform/unix/BuildLinuxImage.sh.in index cd38112f063..be884619921 100644 --- a/src/platform/unix/BuildLinuxImage.sh.in +++ b/src/platform/unix/BuildLinuxImage.sh.in @@ -62,7 +62,7 @@ echo -n "Creating Appimage for distribution..." chmod +x ../build_appimage.sh ../build_appimage.sh popd - mv package/"@SLIC3R_APP_KEY@_ubu64.AppImage" "@SLIC3R_APP_KEY@_ubu64.AppImage" + mv package/"@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage" "@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage" #} &> $ROOT/Build.log # Capture all command output echo "done" fi diff --git a/src/platform/unix/build_appimage.sh.in b/src/platform/unix/build_appimage.sh.in index 8e67e8617e3..55581fc007d 100644 --- a/src/platform/unix/build_appimage.sh.in +++ b/src/platform/unix/build_appimage.sh.in @@ -2,7 +2,7 @@ APPIMAGETOOLURL="https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage" -APP_IMAGE="@SLIC3R_APP_KEY@_ubu64.AppImage" +APP_IMAGE="@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage" wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage chmod +x ../appimagetool.AppImage