Skip to content
This repository was archived by the owner on Dec 15, 2020. It is now read-only.

Commit ec1dcb0

Browse files
LadsgroupLadsgroup
authored
Merge pull request #73 from wmde/update-build
Update build
2 parents ec1ea88 + 39025d9 commit ec1dcb0

File tree

19 files changed

+116
-3097
lines changed

19 files changed

+116
-3097
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.travis.yml export-ignore
77
build export-ignore
88
composer.json export-ignore
9+
karma.conf.js export-ignore
910
phpcs.xml export-ignore
1011
phpunit.xml.dist export-ignore
1112
tests export-ignore

‎.travis.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
language: php
22

33
env:
4-
- QUNIT=false
4+
- JS_BUILD=false
55

66
dist: trusty
77

88
php:
99
- 5.5
1010
- 5.6
1111
- 7
12+
- 7.1
1213
- hhvm
1314

1415
matrix:
1516
include:
1617
- php: 5.5
17-
env: QUNIT=true
18+
env: JS_BUILD=true
1819

1920
before_script:
2021
- composer install --prefer-source
21-
- npm install eslint eslint-config-wikimedia
22+
- if [[ "$JS_BUILD" == true ]]; then npm install; fi
2223

2324
script:
2425
- composer test
25-
- bash ./build/travis/script.sh
26+
- if [[ "$JS_BUILD" == true ]]; then npm test; fi
2627

2728
notifications:
2829
email:

‎build/travis/script.sh‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"irc": "irc://irc.freenode.net/wikidata"
2424
},
2525
"require": {
26-
"php": ">=5.5.0"
26+
"php": ">=5.5.9"
2727
},
2828
"require-dev": {
2929
"phpunit/phpunit": "~4.8",

‎js/config.js‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎js/lib/TestRunner/TestRunner.js‎

Lines changed: 0 additions & 156 deletions
This file was deleted.

‎js/lib/TestRunner/TestRunner.phantom.js‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎js/lib/TestRunner/runTests.phantom.js‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎js/lib/jquery/jquery.js‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎js/lib/qunit.parameterize/LICENCE‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)