Krinkle has submitted this change and it was merged.
Change subject: mwext-VisualEditor-doc: Fix mw-setup-extension and modules path.
......................................................................
mwext-VisualEditor-doc: Fix mw-setup-extension and modules path.
The former installed MediaWiki allright, but it didn't include
VisualEditor from LocalSettings.php, which meant that, though the
maintenance script worked, it didn't output anything useful as
the ResourceLoader modules of VE weren't registered.
Also fixing the relative path to modules. Since we only rsync the
docs/ directory, it couldn't find the ../modules directory.
Fixing by syncing that into a subdirectory.
Change-Id: Icfc14882995b3178a029943f317aa196d3de8635
---
M mediawiki-extensions.yaml
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index e0395a3..5554830 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -98,15 +98,16 @@
- junit:
results: 'junit*.xml'
+# VisualEditor's docgen has a maintenance script, so install mediawiki first
- job-template:
name: 'mwext-VisualEditor-doc-test'
defaults: use-zuul-for-mw-ext
triggers:
- zuul
builders:
- - get-mw-core:
- branch: 'master'
- - mw-install-sqlite
+ - mw-setup-extension:
+ mwbranch: '{mwbranch}'
+ dependencies: '{dependencies}'
- shell: "$WORKSPACE/extensions/VisualEditor/.docs/generate.sh"
- job-template:
@@ -115,14 +116,12 @@
triggers:
- zuul
builders:
- - get-mw-core:
- branch: 'master'
- # VisualEditor's custom documentation generator has a maintenance
- # script which needs MediaWiki to be installed first.
- - mw-install-sqlite
+ - mw-setup-extension:
+ mwbranch: '{mwbranch}'
+ dependencies: '{dependencies}'
- shell: |
# Generate documentation
- $WORKSPACE/extensions/VisualEditor/.docs/generate.sh
+ $WORKSPACE/extensions/VisualEditor/.docs/generate.sh
--ve-path="modules/"
# Set destination and version directory therein
DEST_DIR="/srv/org/wikimedia/doc/VisualEditor"
DEST_VERSIONDIR=`echo "$GERRIT_BRANCH" | tr '/' '-'`
@@ -130,6 +129,7 @@
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/"
# These are jobs we create for all of the extensions
# listed below. If a job should only be created
--
To view, visit https://gerrit.wikimedia.org/r/56511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfc14882995b3178a029943f317aa196d3de8635
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
