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

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


osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/14748 )

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: 55f03b898a3113f7b73a3abd1c2dfe2edd6135ac ("contrib/jenkins.sh: run "make maintainer-clean"")
Change-Id: I8bcee9069743b76966a78e1c13d0be9ba62d992c
---
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 da96c5e..23ff522 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -54,10 +54,10 @@
 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

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14748
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I8bcee9069743b76966a78e1c13d0be9ba62d992c
Gerrit-Change-Number: 14748
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/da9cee23/attachment.html>


More information about the gerrit-log mailing list