From 97d5a790303ca31c70f8cc557fdf0ee4ce578f2d Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 7 Feb 2024 08:28:22 -0300 Subject: build: prevent make clean error if compile.sh --clean fails In the `debian_ci` job in .gitlab-ci.yml, dpkg-deb calls `make distclean` before calling ./configure, which makes `make clean` fail due to test/compile/compile.sh not being able to source config.mk (which is created by ./configure): dpkg-source -i -I --before-build . [...] dh_auto_clean make -j2 distclean make[1]: Entering directory '/builds/Firejail/firejail_ci' error: run ./configure to generate config.mk [...] cd compile && ./compile.sh --clean ./compile.sh: line 15: ./../../config.sh: No such file or directory make[2]: *** [Makefile:24: clean] Error 1 This amends commit 152a21f15 ("build: simplify clean target", 2023-07-29) / PR #6186. --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index 2ac6e4c6f..52fada86c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -21,4 +21,4 @@ clean: rm -f utils/index.html* rm -f utils/lstesting rm -f utils/wget-log - cd compile && ./compile.sh --clean + cd compile && (./compile.sh --clean || true) -- cgit v1.2.3-70-g09d2