CI: Try to fix the CI [gen-appimage]

.gitlab-ci.yml

@@ -16,12 +16,11 @@ stages:
         variables:
             - $CI_MERGE_REQUEST_TITLE =~ /^WIP:/
             - $CI_MERGE_REQUEST_TITLE =~ /^Draft:/
-            - $CI_COMMIT_TITLE        =~ /skip-ci/
-            - $CI_COMMIT_TITLE        =~ /no-build/
+            - $CI_COMMIT_TITLE        =~ /.*skip-ci.*/
+            - $CI_COMMIT_TITLE        =~ /.*no-build.*/
     variables:
         SRC_DIR: $CI_PROJECT_DIR                            # Where the sources are
         WORK_DIR: "/home/gitlab-runner/CI_$CI_PIPELINE_ID"  # Where we will work, so that it's not erased
-        TARGET_DIR: "/home/gitlab-runner/dist/lektor/"      # Where generated binaries will be copied
 
 .breaking_tests: &breaking_tests
     allow_failure: true
@@ -29,14 +28,14 @@ stages:
 .bin_generation: &bin_generation
     tags:
         - kurisu
+    only:
+        - master
+        - merge_requests
     except:
         variables:
-            - $CI_COMMIT_TITLE =~ /skip-ci/
-            - $CI_COMMIT_TITLE =~ /no-build/
-            - $CI_COMMIT_TITLE == /gen-appimage/
+            - $CI_COMMIT_TITLE == /.*gen-appimage.*/
     variables:
-        SRC_DIR: $CI_PROJECT_DIR                            # Where the sources are
-        WORK_DIR: "/home/gitlab-runner/CI_$CI_PIPELINE_ID"  # Where we will work, so that it's not erased
+        TARGET_DIR: "/home/gitlab-runner/dist/lektor/"      # Where generated binaries will be copied
 
 variables:
     GIT_DEPTH: 3 # No need to clone all the history
@@ -113,5 +112,6 @@ build_clang:
 
 appimage_clang:
     <<: *bin_generation
+    <<: *main_tests
     stage: redist
     script: utils/scripts/validate.bash --build=clang --static-modules --appimage --step=configure,build,copy

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_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
 LKT_TARGET_DIR=$TARGET_DIR  # The bin dir, where AppImages will be placed
@@ -225,6 +226,9 @@ function process_args ()
     if [ "x$LKT_STATIC_MODULES" = "xyes" ] ; then
         LKT_CONFIGURE_OPTIONS="$LKT_CONFIGURE_OPTIONS --with-liblektor=static"
     fi
+    if [ "x$LKT_APPIMAGE" == "xyes" ] ; then
+        LKT_CONFIGURE_OPTIONS="$LKT_CONFIGURE_OPTIONS --enable-appimage"
+    fi
     LKT_CONFIGURE_OPTIONS="$LKT_CONFIGURE_OPTIONS CC=$LKT_COMPILER"
 }
 
@@ -238,6 +242,9 @@ for arg in $* ; do
         --debug)
             LKT_DEBUG="yes"
             ;;
+        --appimage)
+            LKT_APPIMAGE="yes"
+            ;;
         --build=*)
             LKT_COMPILER=$(echo "A$arg" | sed -e 's/A--build=//g')
             ;;