From 14c80fdb65671615cbb44329bae9f57a4e6d68d7 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 11 Jul 2019 09:25:49 +0200 Subject: contrib/jenkins.sh: "maintainer-clean" after "publish" Run "make maintainer-clean" after publishing manuals, not the other way around. Otherwise jenkins.sh fails when running for the master branch, because docs/manuals/Makefile gets deleted although it is still needed to publish the manuals. Related: OS#3047 Fixes: 471fd92170297f1c857bb448bbf21a162c2ed655 ("contrib/jenkins.sh: run "make maintainer-clean"") Change-Id: I8ba5369b0948b61c68f43d807312c52465119aa5 --- contrib/jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 524971b01..73f117428 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -61,10 +61,10 @@ LD_LIBRARY_PATH="$inst/lib" \ DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh -$MAKE maintainer-clean if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then make -C "$base/doc/manuals" publish fi +$MAKE maintainer-clean osmo-clean-workspace.sh -- cgit v1.2.3