diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml deleted file mode 100644 index f113af7c8..000000000 --- a/.github/workflows/build_linux.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Build Linux - -on: [push, pull_request] - -jobs: - appimage-builder: - name: Linux AppImage Build - - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v3 - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y - - name: Install dependencies from BuildLinux.sh - shell: bash - run: sudo ./BuildLinux.sh -ur - - name: Fix permissions - shell: bash - run: sudo chown $USER -R ./ - - name: Build deps - id: cache_deps - uses: actions/cache@v3 - env: - cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64 - with: - path: ${{ github.workspace }}/deps/build/destdir - key: build-${{ env.cache-name }} - - - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} - name: Build deps - working-directory: ${{ github.workspace }} - continue-on-error: true - run: ./BuildLinux.sh -dsr - - - name: Build Studio - shell: bash - run: ./BuildLinux.sh -ir - - uses: actions/upload-artifact@v3 - with: - name: BambuStudio_Linux - path: './build/BambuStudio_ubu64.AppImage' diff --git a/BuildLinux.sh b/BuildLinux.sh index 48af93584..f862d4cc0 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -28,7 +28,7 @@ function check_available_memory_and_disk() { } unset name -while getopts ":dsiuhgbr" opt; do +while getopts ":dsiuhgb" opt; do case ${opt} in u ) UPDATE_LIB="1" @@ -48,9 +48,6 @@ while getopts ":dsiuhgbr" opt; do g ) FOUND_GTK3="" ;; - r ) - SKIP_RAM_CHECK="1" - ;; h ) echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]" echo " -i: Generate appimage (optional)" echo " -g: force gtk2 build" @@ -58,7 +55,6 @@ while getopts ":dsiuhgbr" opt; do echo " -d: build deps (optional)" echo " -s: build bambu-studio (optional)" echo " -u: only update clock & dependency packets (optional and need sudo)" - echo " -r: skip free ram check (low ram compiling)" echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'" echo " and then './BuildLinux.sh -dsi'" exit 0 @@ -75,7 +71,6 @@ then echo " -d: build deps (optional)" echo " -s: build bambu-studio (optional)" echo " -u: only update clock & dependency packets (optional and need sudo)" - echo " -r: skip free ram check (low ram compiling)" echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'" echo " and then './BuildLinux.sh -dsi'" exit 0 @@ -158,10 +153,7 @@ then mkdir deps/build fi -if ! [[ -n "$SKIP_RAM_CHECK" ]] -then check_available_memory_and_disk -fi if [[ -n "$BUILD_DEPS" ]] then diff --git a/src/platform/unix/build_appimage.sh.in b/src/platform/unix/build_appimage.sh.in index fa2b2b040..0e12d85f7 100644 --- a/src/platform/unix/build_appimage.sh.in +++ b/src/platform/unix/build_appimage.sh.in @@ -7,10 +7,6 @@ APP_IMAGE="@SLIC3R_APP_KEY@_ubu64.AppImage" wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage chmod +x ../appimagetool.AppImage -if [ -f /.dockerenv ] ; then # Only run if inside of a Docker Container -sed '0,/AI\x02/{s|AI\x02|\x00\x00\x00|}' -i ../appimagetool.AppImage -fi - sed -i -e 's#/usr#././#g' bin/@SLIC3R_APP_CMD@ mv @SLIC3R_APP_CMD@ AppRun chmod +x AppRun @@ -29,12 +25,6 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj; EOF - -if [ -f /.dockerenv ] ; then # Only run if inside of a Docker Container - ../appimagetool.AppImage --appimage-extract-and-run . $([ ! -z "${container}" ] && echo '--appimage-extract-and-run') -else - ../appimagetool.AppImage . $([ ! -z "${container}" ] && echo '--appimage-extract-and-run') -fi - +../appimagetool.AppImage . $([ ! -z "${container}" ] && echo '--appimage-extract-and-run') mv @SLIC3R_APP_KEY@-x86_64.AppImage ${APP_IMAGE} chmod +x ${APP_IMAGE}