jenkins-bot has submitted this change and it was merged.
Change subject: build: Remove 'checkInstallPath' task
......................................................................
build: Remove 'checkInstallPath' task
jsduck doesn't need MW_INSTALL_PATH. Probably a left over?
This is a prerequisite for letting MobileFrontend ride the
npm-run-doc train in Jenkins.
Change-Id: Ic7a89d51c8bfb6e96802d31a79277ca58a2d9182
---
M Gruntfile.js
M Makefile
2 files changed, 2 insertions(+), 24 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index a0108b2..31de7bf 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,8 +6,6 @@
/*jshint node:true, strict:false*/
module.exports = function ( grunt ) {
- var MW_INSTALL_PATH = grunt.option( 'MW_INSTALL_PATH' ) ||
process.env.MW_INSTALL_PATH;
-
grunt.loadNpmTasks( 'grunt-mkdir' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
@@ -149,12 +147,8 @@
}
} );
- grunt.registerTask( 'checkInstallPath', 'Check if the install path is
set', function () {
- checkInstallPathNotFound( MW_INSTALL_PATH, grunt );
- } );
-
grunt.registerTask( 'lint', [ 'jshint', 'jscs' ] );
- grunt.registerTask( 'docs', [ 'checkInstallPath', 'clean:jsdocs',
'mkdir:jsdocs', 'jsduck:main' ] );
+ grunt.registerTask( 'docs', [ 'clean:jsdocs', 'mkdir:jsdocs',
'jsduck:main' ] );
// grunt test will be run by npm test which will be run by Jenkins
// Do not execute qunit here, or other tasks that require full mediawiki
@@ -163,19 +157,3 @@
grunt.registerTask( 'default', [ 'test' ] );
};
-
-/**
- * Checks if the path is set, and if not it prints an error message and bails
- * out
- */
-function checkInstallPathNotFound( MW_INSTALL_PATH, grunt ) {
- if ( !MW_INSTALL_PATH ) {
- grunt.log.error(
- 'MW_INSTALL_PATH is not set. Please set it to your root
mediawiki installation or pass the --MW_INSTALL_PATH to grunt.\n\n' +
- '\n export
MW_INSTALL_PATH=/Users/johndoe/dev/mediawiki' +
- '\n MW_INSTALL_PATH=../../ grunt' +
- '\n grunt --MW_INSTALL_PATH=../../'
- );
- process.exit( 1 );
- }
-}
diff --git a/Makefile b/Makefile
index c5f9957..4e92a69 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
@dev-scripts/remotes/gerrit.py --project
'mediawiki/extensions/MobileFrontend' --gtscore -1 --ignore 'WIP'
jsduck: nodecheck gems ## Build the JavaScript documentation
- @grunt docs --MW_INSTALL_PATH=${MW_INSTALL_PATH}
+ @grunt docs
phpdoc: nodecheck ## Build the PHP documentation
mkdir -p docs
--
To view, visit https://gerrit.wikimedia.org/r/219300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7a89d51c8bfb6e96802d31a79277ca58a2d9182
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[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
