Skip to content

Commit 99de154

Browse files
committed
Merge pull request #576 from XhmikosR/travis
Update Travis
2 parents dd769b0 + 0f920bb commit 99de154

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

.travis.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
sudo: false
2+
13
language: node_js
4+
25
node_js:
3-
- "0.8"
46
- "0.10"
5-
- "0.11"
6-
before_install:
7-
- '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g [email protected]'
8-
- npm install -g npm@latest
7+
- "4"
8+
- "5"
9+
10+
install:
911
- npm install -g grunt-cli
12+
- npm install
13+
14+
matrix:
15+
fast_finish: true

Gruntfile.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,9 @@ module.exports = function(grunt) {
215215
}
216216
});
217217

218-
// These plugins provide necessary tasks.
219-
grunt.loadNpmTasks("grunt-contrib-clean");
220-
grunt.loadNpmTasks("grunt-contrib-concat");
221-
grunt.loadNpmTasks("grunt-contrib-copy");
222-
grunt.loadNpmTasks("grunt-contrib-jshint");
223-
grunt.loadNpmTasks("grunt-contrib-watch");
224-
grunt.loadNpmTasks("grunt-include-replace");
218+
// Load any grunt plugins found in package.json.
219+
require("load-grunt-tasks")(grunt, {scope: "devDependencies"});
220+
require("time-grunt")(grunt);
225221

226222
// Load custom tasks
227223
grunt.loadTasks("tasks");

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@
3131
},
3232
"devDependencies": {
3333
"grunt": "~0.4.5",
34-
"grunt-contrib-clean": "~0.6.0",
34+
"grunt-contrib-clean": "~0.7.0",
3535
"grunt-contrib-concat": "~0.5.1",
3636
"grunt-contrib-copy": "~0.8.0",
3737
"grunt-contrib-jshint": "~0.11.0",
3838
"grunt-contrib-watch": "~0.6.1",
39-
"grunt-include-replace": "~3.0.0",
39+
"grunt-include-replace": "~3.2.0",
40+
"load-grunt-tasks": "~3.4.0",
41+
"time-grunt": "~1.3.0",
4042
"yuitest": "~0.7.9"
4143
},
4244
"engines": {
43-
"node": ">=0.8.0"
45+
"node": ">=0.10.0"
4446
},
4547
"directories": {
4648
"test": "tests"

0 commit comments

Comments
 (0)