From d7e1141c1e3248f9bdf93b2dc45cc54df37a60ef Mon Sep 17 00:00:00 2001 From: Anderson Toshiyuki Sasaki Date: Mon, 2 Sep 2019 11:23:46 +0200 Subject: [PATCH] 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 Reviewed-by: Jakub Jelen (cherry picked from commit 7ffa3c358d727a711dc26806f3c07c9add584e5c) --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02dbce86..38a97587 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -169,8 +169,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