jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348804 )
Change subject: build: Drop the csscomb task
......................................................................
build: Drop the csscomb task
Finally time to bite the bullet on this one.
Not that it really saves anything worthwhile:
Before After
real 3m41.076s 3m41.066s
user 2m0.355s 1m59.627s
sys 0m41.429s 0m39.145s
Change-Id: I39adec9947aafd263e4fddd81dbe398ed61f87a8
---
M Gruntfile.js
M package.json
2 files changed, 1 insertion(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/Gruntfile.js b/Gruntfile.js
index 9045a0f..482854e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,7 +27,6 @@
grunt.loadNpmTasks( 'grunt-contrib-less' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
- grunt.loadNpmTasks( 'grunt-csscomb' );
grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-exec' );
grunt.loadNpmTasks( 'grunt-file-exists' );
@@ -270,12 +269,6 @@
files: {
'demos/styles/demo.rtl.css':
'demos/styles/demo.css'
}
- }
- },
- csscomb: {
- dist: {
- expand: true,
- src: 'dist/*.css'
}
},
copy: {
@@ -588,7 +581,7 @@
grunt.registerTask( 'build-code', [ 'concat:js' ] );
grunt.registerTask( 'build-styling', [
'colorizeSvg', 'set-graphics', 'less', 'cssjanus',
- 'concat:css', 'concat:demoCss', 'csscomb',
+ 'concat:css', 'concat:demoCss',
'copy:imagesCommon', 'copy:imagesThemes',
'svg2png'
] );
diff --git a/package.json b/package.json
index b69d46d..c97fe60 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,6 @@
"grunt-contrib-less": "1.4.1",
"grunt-contrib-uglify": "2.2.0",
"grunt-contrib-watch": "1.0.0",
- "grunt-csscomb":
"git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1",
"grunt-cssjanus": "0.4.0",
"grunt-eslint": "19.0.0",
"grunt-exec": "1.0.1",
--
To view, visit https://gerrit.wikimedia.org/r/348804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39adec9947aafd263e4fddd81dbe398ed61f87a8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
