diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2019-07-11 09:25:49 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2019-07-11 09:33:26 +0200 |
| commit | 14c80fdb65671615cbb44329bae9f57a4e6d68d7 (patch) | |
| tree | 0695bcf846f68517ba456ba57f5d643d33162ab0 | |
| parent | 471fd92170297f1c857bb448bbf21a162c2ed655 (diff) | |
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
| -rwxr-xr-x | contrib/jenkins.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |