CI: Update CI to build klkt AppImage [gen-appimage]

.gitlab-ci.yml

@@ -35,7 +35,7 @@ stages:
         - merge_requests
     except:
         variables:
-            - $CI_COMMIT_TITLE == /.*gen-appimage.*/
+            - $CI_COMMIT_TITLE == /.*\[gen-appimage\].*/
 
 variables:
     GIT_DEPTH: 3 # No need to clone all the history
@@ -125,6 +125,10 @@ appimage_lektor_lkt:
     <<: *bin_generation
     <<: *main_tests
     needs: ["build_clang"]
-    script:
-        - export
-        - utils/scripts/validate.bash --build=clang --static-modules --appimage --step=configure,build,copy
+    script: utils/scripts/validate.bash --build=clang --static-modules --appimage --step=configure,build,copy-all
+
+appimage_klkt:
+    <<: *bin_generation
+    <<: *main_tests
+    needs: ["build_gcc"]
+    script: utils/scripts/validate.bash --build=gcc --static-modules --appimage --klkt --step=configure,build,copy-klkt

utils/scripts/validate.bash

@@ -14,6 +14,7 @@ LKT_DIR="$PWD"              # The project directory
 LKT_CONFIGURE_OPTIONS=""    # Options to pass to the configure command
 LKT_CORE_NUMBER=4           # Number of cores to use with make
 LKT_TEST=""                 # Which tests to perform
+LKT_KLKT=""                 # Build klkt? with --enable-klkt
 LKT_APPIMAGE=""             # Run configure with --enable-appimage
 LKT_SRC=$SRC_DIR            # Where to find the sources of lektor
 LKT_WORK=$WORK_DIR          # The work dir, where to play
@@ -169,12 +170,14 @@ function do_build ()
 # - LKT_DIR                 Project root directory                           #
 # - LKT_COMPILER            The compiler used to build                       #
 # - LKT_TARGET_DIR          The destination of the AppImages on kurisu       #
+# Arguments:
+# - $*                      Positiv filter to copy                           #
 function do_copy ()
 {
     check_cd $LKT_BUILD
     check_make appimage
     mkdir -p "$LKT_TARGET_DIR/$(date +%F)"
-    check_cp "$LKT_BUILD/*.AppImage" "$LKT_TARGET_DIR/$(date +%F)"
+    check_cp "$LKT_BUILD/*$**-`arch`.AppImage" "$LKT_TARGET_DIR/$(date +%F)"
     check_cd $LKT_DIR
 }
 
@@ -189,7 +192,8 @@ function do_steps ()
     local _launch=
     local _cleanup=
     local _format=
-    local _copy=
+    local _copy_all=
+    local _copy_klkt=
     local _check_configure=
     for step in $LKT_STEP ; do
         case "$step" in
@@ -199,7 +203,8 @@ function do_steps ()
             launch)          _launch="yes";;
             prepare)         _prepare="yes";;
             format)          _format="yes";;
-            copy)            _copy="yes";;
+            copy-all)        _copy_all="yes";;
+            copy-klkt)       _copy_klkt="yes";;
         esac
     done
 
@@ -209,7 +214,8 @@ function do_steps ()
     [ "x$_configure"       = "xyes" ] && do_configure
     [ "x$_build"           = "xyes" ] && do_build
     [ "x$_launch"          = "xyes" ] && do_launch
-    [ "x$_copy"            = "xyes" ] && do_copy            # dist AppImage
+    [ "x$_copy_all"        = "xyes" ] && do_copy            # dist AppImage
+    [ "x$_copy_klkt"       = "xyes" ] && do_copy klkt       # dist klkt
     [ "x$_cleanup"         = "xyes" ] && do_cleanup
 }
 
@@ -259,6 +265,9 @@ function process_args ()
     if [ "x$LKT_APPIMAGE" == "xyes" ] ; then
         LKT_CONFIGURE_OPTIONS="$LKT_CONFIGURE_OPTIONS --enable-appimage"
     fi
+    if [ "x$LKT_KLKT" == "xyes" ] ; then
+        LKT_CONFIGURE_OPTIONS="$LKT_CONFIGURE_OPTIONS --enable-klkt"
+    fi
     LKT_CONFIGURE_OPTIONS="$LKT_CONFIGURE_OPTIONS CC=$LKT_COMPILER"
 }
 
@@ -272,6 +281,9 @@ for arg in $* ; do
         --debug)
             LKT_DEBUG="yes"
             ;;
+        --klkt)
+            LKT_KLKT="yes"
+            ;;
         --appimage)
             LKT_APPIMAGE="yes"
             ;;