jenkins-bot has submitted this change and it was merged.
Change subject: build: Add composer test, initially with just parallel-test
......................................................................
build: Add composer test, initially with just parallel-test
Also convert spaces to tabs in composer.json.
Also minor updates to other files.
Removed non existing file from .jshintignore
Bug: T115392
Change-Id: Id8fef217f22702915b7d7458b2a07a271fbdde8e
---
M .gitignore
M .jshintignore
M composer.json
3 files changed, 19 insertions(+), 14 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 9319e8b..9ebc966 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,10 @@
-.svn
*~
*.kate-swp
.*.swp
scripts/hhvm-wrapper.phar
scripts/remotes
-node_modules/
tests/browser/.gem
tests/browser/screenshots
-vendor/composer/
-vendor/symfony/
-vendor/autoload.php
\#*#
+node_modules/
+vendor/
diff --git a/.jshintignore b/.jshintignore
index 8d8bf20..022b988 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,2 +1,2 @@
-modules/jquery.scroll.js
+node_modules
vendor
diff --git a/composer.json b/composer.json
index de1290b..2672528 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,18 @@
{
- "name": "mediawiki/flow",
- "description": "Discussion and collaboration system extension for
MediaWiki",
- "license": "GPL-2.0+",
- "require": {},
- "require-dev": {
- "symfony/dom-crawler": "~2.5",
- "symfony/css-selector": "~2.5"
- }
+ "name": "mediawiki/flow",
+ "description": "Discussion and collaboration system extension for
MediaWiki",
+ "license": "GPL-2.0+",
+ "require": {},
+ "require-dev": {
+ "symfony/dom-crawler": "~2.5",
+ "symfony/css-selector": "~2.5"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor"
+ ]
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/246981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8fef217f22702915b7d7458b2a07a271fbdde8e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
