diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index f71148e6ed..59f8f1b9f4 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -63,18 +63,39 @@ jobs: flatpak: name: "Flatpak" runs-on: ubuntu-latest + env: + date: + ver: + ver_pure: container: image: bilelmoussaoui/flatpak-github-actions:gnome-46 options: --privileged steps: - # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd - - name: "Remove unneeded stuff to free disk space" - run: - sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" + - name: free disk space + uses: jlumbroso/free-disk-space@main + with: + tool-cache: true + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: false + swap-storage: true - uses: actions/checkout@v4 + - name: Get the version and date + run: | + ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2) + if [[ "${{ github.event_name }}" == "pull_request" ]]; then + ver="PR-${{ github.event.number }}" + else + ver=V$ver_pure + fi + echo "ver=$ver" >> $GITHUB_ENV + echo "ver_pure=$ver_pure" >> $GITHUB_ENV + echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV + shell: bash - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: - bundle: orcaslicer.flatpak + bundle: OrcaSlicer-Linux_${{ env.ver }}.flatpak manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml - cache-key: flatpak-builder-${{ github.sha }} - cache: false + cache: true diff --git a/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml b/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml index 1b2a60d743..4c04ff99a0 100755 --- a/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml +++ b/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml @@ -36,7 +36,7 @@ -

A 3D printer slicer forked from Bambu Studio, PrusaSlicer, and SuperSlicer with many more printer profiles, helpful calibration prints, and many more features to get your 3D printer printing perfectly!

+

A powerful, free and open-source 3D printer slicer that features cutting-edge technology.

#009688 diff --git a/flatpak/setup_env_ubuntu24.04.sh b/flatpak/setup_env_ubuntu24.04.sh new file mode 100755 index 0000000000..d26531e001 --- /dev/null +++ b/flatpak/setup_env_ubuntu24.04.sh @@ -0,0 +1,15 @@ +#! /bin/bash + +sudo apt update +sudo apt install build-essential flatpak flatpak-builder gnome-software-plugin-flatpak -y +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak install flathub org.gnome.Platform//46 org.gnome.Sdk//46 + + +## +# in OrcaSlicer folder, run following command to build Orca +# # First time build +# flatpak-builder --state-dir=.flatpak-builder --keep-build-dirs --user --force-clean build-dir flatpak/io.github.softfever.OrcaSlicer.yml + +# # Subsequent builds (only rebuilding OrcaSlicer) +# flatpak-builder --state-dir=.flatpak-builder --keep-build-dirs --user build-dir flatpak/io.github.softfever.OrcaSlicer.yml --build-only=OrcaSlicer \ No newline at end of file diff --git a/version.inc b/version.inc index 7eb37fdde4..959a5a14d6 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "0") endif() -set(SoftFever_VERSION "2.3.0-dev") +set(SoftFever_VERSION "2.35.0-dev") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" SoftFever_VERSION_MATCH ${SoftFever_VERSION}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})