Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/107905
Change subject: mwext-VisualEditor-doc: Update publish and test to match new logistics ...................................................................... mwext-VisualEditor-doc: Update publish and test to match new logistics * We no longer need a MediaWiki install for the maintenance script. bin/generateDocs.sh now uses the HTML files generated by Grunt and committed to Git (not a MediaWiki maintenance script). * The documentation needs lib/ instead of modules/ as modules/ve has been moved to lib/ve. * See also I10eaa5424d172932b in mediawiki/extensions/VisualEditor.git Change-Id: Ib7ce9c6808f31a47c3ba08697cf405a78eda871d --- M mediawiki-extensions.yaml 1 file changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/05/107905/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 6f2f9f8..4df47c4 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -163,16 +163,13 @@ - job-template: name: 'mwext-VisualEditor-doc-publish' node: gallium - defaults: use-zuul-for-mw-ext + defaults: use-remote-zuul triggers: - zuul builders: - - mw-setup-extension: - mwbranch: '{mwbranch}' - dependencies: '{dependencies}' - shell: | # Generate documentation - $WORKSPACE/extensions/VisualEditor/.docs/generate.sh --ve-path="modules/" + $WORKSPACE/extensions/VisualEditor/bin/generateDocs.sh # Set destination and version directory therein DEST_DIR="/srv/org/wikimedia/doc/VisualEditor" DEST_VERSIONDIR=`echo "$ZUUL_BRANCH" | tr '/' '-'` @@ -180,22 +177,19 @@ mkdir -p $DEST_DIR # Publish it (trailing slash is important!) rsync --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/docs/ "$DEST_DIR/$DEST_VERSIONDIR/" - rsync --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/modules/ "$DEST_DIR/$DEST_VERSIONDIR/modules/" + rsync --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/lib/ "$DEST_DIR/$DEST_VERSIONDIR/lib/" # VisualEditor's docgen has a maintenance script, so install mediawiki first - job-template: name: 'mwext-VisualEditor-doc-test' - defaults: use-zuul-for-mw-ext + defaults: use-remote-zuul concurrent: true triggers: - zuul builders: - - mw-setup-extension: - mwbranch: '{mwbranch}' - dependencies: '{dependencies}' - shell: | export TERM=xterm - $WORKSPACE/extensions/VisualEditor/.docs/generate.sh + $WORKSPACE/extensions/VisualEditor/bin/generateDocs.sh - job-template: name: 'mwext-VisualEditor-sync-gerrit' # bug 49846 -- To view, visit https://gerrit.wikimedia.org/r/107905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7ce9c6808f31a47c3ba08697cf405a78eda871d Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits