summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-07-11 09:30:59 +0200
committerOliver Smith <osmith@sysmocom.de>2019-07-11 09:33:56 +0200
commitfdff85b8d58eeae4f3216c507c5763a1b452d1d1 (patch)
treef16c20f86f1340884f27bca21bad13eaee71a399
parent55f03b898a3113f7b73a3abd1c2dfe2edd6135ac (diff)
contrib/jenkins.sh: "maintainer-clean" after "publish"HEADmaster
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: 55f03b898a3113f7b73a3abd1c2dfe2edd6135ac ("contrib/jenkins.sh: run "make maintainer-clean"") Change-Id: I8bcee9069743b76966a78e1c13d0be9ba62d992c
-rwxr-xr-xcontrib/jenkins.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index da96c5e..23ff522 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -54,10 +54,10 @@ $MAKE $PARALLEL_MAKE
DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests $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