Merge remote-tracking branch 'remotes/local/dev' into superslicer_variant

.github/workflows/ccpp_ubuntu_gtk3.yml

@@ -68,7 +68,8 @@ jobs:
       id: cache-action
       uses: actions/cache@v3
       with:
-        key: ubu_gtk3_relwithdeb_2.7
+        key: ubu_gtk3_2.7
+#        key: ubu_gtk3_relwithdeb_2.7
         path: deps/build/destdir
     - name: check disk space
       run: df -h

BuildLinux.sh

@@ -370,6 +370,7 @@ then
     chmod 755 $ROOT/build/src/BuildLinuxImage.sh
 
     pushd build  > /dev/null
+    echo "\n[8/9] launch ${ROOT}/build/src/BuildLinuxImage.sh -a -g ${GTK_VERSION}"
     $ROOT/build/src/BuildLinuxImage.sh -a -g $GTK_VERSION
     popd  > /dev/null
     echo "> ls ROOT"

src/platform/unix/BuildLinuxImage.sh.in

@@ -21,6 +21,7 @@ fi
 export ROOT=`pwd`
 export NCORES=`nproc`
 
+GTK_VERSION="3"
 VERSION_NUMBER=""
 while getopts ":iagvhg:" opt; do
   case ${opt} in
@@ -32,6 +33,7 @@ while getopts ":iagvhg:" opt; do
         ;;
     g )
         GTK_VERSION=$OPTARG
+        echo "GTK_VERSION=${GTK_VERSION}"
         ;;
     v )
         export VERSION_NUMBER="-@SLIC3R_VERSION_FULL@"
@@ -119,7 +121,7 @@ then
     then
         mv package/"@SLIC3R_APP_KEY@_ubu64.AppImage" "@SLIC3R_APP_KEY@${VERSION_NUMBER}-linux-x64-GTK3.AppImage"
     else
-        echo -e "\nError, only GTK2 and GTK3 verison are supported. Asked GTK version: "
+        echo -e "\nError, only GTK2 and GTK3 verison are supported. Asked GTK version: ${GTK_VERSION}"
     fi
     echo -e "\n... done\n"
 fi