aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-09-02 11:23:46 +0200
committerAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-09-24 16:49:35 +0200
commit7ffa3c358d727a711dc26806f3c07c9add584e5c (patch)
treeb7139261e778644cc021a943bd4e8a1a62c73e79
parente72429f205bd1a17062ae95f8850b510d71b2964 (diff)
downloadlibssh-7ffa3c358d727a711dc26806f3c07c9add584e5c.tar.gz
libssh-7ffa3c358d727a711dc26806f3c07c9add584e5c.tar.xz
libssh-7ffa3c358d727a711dc26806f3c07c9add584e5c.zip
gitlab-ci: Move cmake from prep to build command in csbuild
This is required to avoid csbuild scan failures when a commit removes source files. The command prep is run only once before all the builds, making csbuild to try to compile the old files using the configuration files generated for the newest version. Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-rw-r--r--.gitlab-ci.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af4b01fb..710e4b9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,8 +171,7 @@ fedora/csbuild:
- csbuild
--build-dir=obj-csbuild
- --prep-cmd="rm -rf CMakeFiles CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=Debug -DPICKY_DEVELOPER=ON -DUNIT_TESTING=ON -DCLIENT_TESTING=ON -DSERVER_TESTING=ON -DFUZZ_TESTING=ON @SRCDIR@"
- --build-cmd "make clean && make -j$(nproc)"
+ --build-cmd "rm -rf CMakeFiles CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=Debug -DPICKY_DEVELOPER=ON -DUNIT_TESTING=ON -DCLIENT_TESTING=ON -DSERVER_TESTING=ON -DFUZZ_TESTING=ON @SRCDIR@ && make clean && make -j$(nproc)"
--git-commit-range $CI_COMMIT_RANGE
--color
--print-current --print-fixed