From 62d8af839f75257bae3bcd03c9070ed9537a866d Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 5 Feb 2021 21:02:14 +0100
Subject: [PATCH] FIX: Forgot that no more klkt.AppImage is generated, update
the CI [gen-appimage]
---
.gitlab-ci.yml | 12 +++---------
utils/scripts/validate.bash | 3 ---
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0569db2..dc29e043 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,20 +117,14 @@ build_clang:
### Packages ####################################
#################################################
-kagari_deploy:
+kagari:
<<: *main_tests
<<: *bin_generation
needs: ["env_sanitize"]
script: utils/scripts/validate.bash --step=kagari
-appimage_lektor_lkt:
- <<: *bin_generation
- <<: *main_tests
- needs: ["build_clang"]
- script: utils/scripts/validate.bash --build=clang --static-modules --appimage --step=configure,build,copy-all
-
-appimage_klkt:
+appimage:
<<: *bin_generation
<<: *main_tests
needs: ["build_gcc"]
- script: utils/scripts/validate.bash --build=gcc --static-modules --appimage --klkt --step=configure,build,copy-klkt
+ script: utils/scripts/validate.bash --build=gcc --static-modules --appimage --klkt --step=configure,build,copy-all
diff --git a/utils/scripts/validate.bash b/utils/scripts/validate.bash
index f96af44c..6a4c0fb8 100755
--- a/utils/scripts/validate.bash
+++ b/utils/scripts/validate.bash
@@ -198,7 +198,6 @@ function do_steps ()
local _cleanup=
local _format=
local _copy_all=
- local _copy_klkt=
local _check_configure=
local _copy_kagari=
for step in $LKT_STEP ; do
@@ -211,7 +210,6 @@ function do_steps ()
prepare) _prepare="yes";;
format) _format="yes";;
copy-all) _copy_all="yes";;
- copy-klkt) _copy_klkt="yes";;
esac
done
@@ -223,7 +221,6 @@ function do_steps ()
[ "x$_build" = "xyes" ] && do_build
[ "x$_launch" = "xyes" ] && do_launch
[ "x$_copy_all" = "xyes" ] && do_copy # dist AppImage
- [ "x$_copy_klkt" = "xyes" ] && do_copy -klkt # dist klkt
[ "x$_cleanup" = "xyes" ] && do_cleanup
}
--
GitLab