jenkins-bot has submitted this change and it was merged.
Change subject: mwcore-docgen: drop TARGET_PROJECTDIR
......................................................................
mwcore-docgen: drop TARGET_PROJECTDIR
The doc is now generated directly in TARGET_BASEDIR. It is now up to JJB
push-doc macro to determine the project base dir.
Change-Id: I96f0610ff44b985ada8b6afa7309c4747ced64d5
---
M tools/mwcore-docgen.sh
1 file changed, 1 insertion(+), 8 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh
index 7b8209c..687550f 100755
--- a/tools/mwcore-docgen.sh
+++ b/tools/mwcore-docgen.sh
@@ -13,14 +13,7 @@
. "/srv/deployment/integration/slave-scripts/bin/mw-set-env.sh"
TARGET_BASEDIR=${TARGET_BASEDIR:-/srv/org/wikimedia/doc}
-TARGET_PROJECTDIR=`echo "$ZUUL_PROJECT" | tr '/' '-'`
TARGET_VERSIONDIR=""
-
-if [ -z "$TARGET_PROJECTDIR" ]; then
- echo "Error: Project name not found."
- echo "\$ZUUL_PROJECT: $ZUUL_PROJECT"
- exit 1
-fi
# Example values:
# - ZUUL_REF: refs/zuul/master/Z74178670e7c5495199f8a92e92cf609c
@@ -51,7 +44,7 @@
# http://doc.wikimedia.org/mediawiki-core/master/php
# http://doc.wikimedia.org/mediawiki-core/REL1_20/php
# http://doc.wikimedia.org/mediawiki-core/1.20.2/php
-DEST_DIR="$TARGET_BASEDIR/$TARGET_PROJECTDIR/$TARGET_VERSIONDIR/php"
+DEST_DIR="$TARGET_BASEDIR/$TARGET_VERSIONDIR/php"
[ ! -d "${DEST_DIR}" ] && mkdir -p "${DEST_DIR}"
echo "Found target: '$DEST_DIR'"
--
To view, visit https://gerrit.wikimedia.org/r/173009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96f0610ff44b985ada8b6afa7309c4747ced64d5
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
