Change in ...osmo-bsc[master]: contrib/jenkins.sh: "maintainer-clean" after "publish"

osmith gerrit-no-reply at lists.osmocom.org
Thu Jul 11 07:46:40 UTC 2019


osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14749 )

Change subject: contrib/jenkins.sh: "maintainer-clean" after "publish"
......................................................................

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
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, approved



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 524971b..73f1174 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -61,10 +61,10 @@
   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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14749
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I8ba5369b0948b61c68f43d807312c52465119aa5
Gerrit-Change-Number: 14749
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190711/77ea0d96/attachment.html>


More information about the gerrit-log mailing list