jenkins-bot has submitted this change and it was merged.
Change subject: mwext-VisualEditor-publish: Replace bin/generateDocs.sh with
'npm run doc'
......................................................................
mwext-VisualEditor-publish: Replace bin/generateDocs.sh with 'npm run doc'
The repository now supports this entry point. Remove the hard coded
shell script and symlink hackery.
Change-Id: I287057f69a4400daba8f071ddec73d586a4308bc
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 18 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 25e5401..0920dc8 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -270,28 +270,21 @@
docsrc: 'docs'
docdest: 'TemplateData/$ZUUL_BRANCH'
-- job-template:
- name: 'mwext-VisualEditor-jsduck-publish'
+- job:
+ name: 'mwext-VisualEditor-publish'
node: contintLabsSlave && UbuntuTrusty
defaults: use-remoteonly-zuul
concurrent: false
triggers:
- zuul
builders:
- - shell: |
- # Generate documentation
- ./bin/generateDocs.sh
- # Replace symlink with copy for publishing
- rm docs/lib
- # Avoid copying all of lib/ since it contains the entire VisualEditor
repository as
- # submodule, containing non-essential code that should not be pushed
to doc.wikimedia.org
- mkdir -p docs/lib/ve
- # Use of trailing slash for src and not dest is important
- rsync --recursive --force lib/ve/lib/ docs/lib/ve/lib
- rsync --recursive --force lib/ve/src/ docs/lib/ve/src
+ - npm-install
+ - npm-run-doc
- doc-publish:
docsrc: 'docs'
docdest: 'VisualEditor/$ZUUL_BRANCH'
+ publishers:
+ - global-teardown
- job-template:
name: 'mwext-VisualEditor-sync-gerrit' # bug 49846
@@ -633,9 +626,6 @@
- 'mwext-TemplateData-jsduck-publish':
ext-name: TemplateData
-
- - 'mwext-VisualEditor-jsduck-publish':
- ext-name: VisualEditor
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 793af96..e87958e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1665,7 +1665,7 @@
- name: 'mwext-TemplateData-jsduck-publish'
branch: ^master$
- - name: 'mwext-VisualEditor-jsduck-publish'
+ - name: 'mwext-VisualEditor-publish'
branch: ^master$
- name: 'mwext-VisualEditor-sync-gerrit'
branch: ^master$
@@ -6697,7 +6697,7 @@
- mwext-VisualEditor-npm
- mwext-VisualEditor-jsduck
postmerge:
- - mwext-VisualEditor-jsduck-publish
+ - mwext-VisualEditor-publish
- mwext-VisualEditor-sync-gerrit
- name: mediawiki/extensions/WebChat
--
To view, visit https://gerrit.wikimedia.org/r/204004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I287057f69a4400daba8f071ddec73d586a4308bc
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
