Revert "ENH: add the linux build action to github"

This reverts commit c0791f0. wrongly pushed to master
cmeans · Jan 31, 2023 · b2caf90 · b2caf90
1 parent c0791f0
commit b2caf90
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 64 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
diff --git 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,17 +48,13 @@ 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"
         echo "   -b: build in debug mode"
         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
@@ -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}