Skip to content

Commit

Permalink
Upgrade grunt and devDeps to 1.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Apr 6, 2016
1 parent be8205a commit 4d56455
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
sudo: false
language: node_js
node_js:
- '5'
- '4'
- '0.10'
- "0.10"
- "0.12"
- "4"
- "5"
- "iojs"
before_install:
- if [ "$TRAVIS_NODE_VERSION" = "0.10" ]; then npm install -g npm@2; fi
- gem update --system
- gem install sass
matrix:
fast_finish: true
cache:
directories:
- node_modules
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ module.exports = function (grunt) {
'nodeunit',
'clean'
]);
grunt.registerTask('default', ['test', 'build-contrib']);
grunt.registerTask('default', ['test', 'contrib-core', 'contrib-ci:skipIfExists']);
};
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:
- ps: Install-Product node $env:nodejs_version $env:platform
- ps: >-
if ($env:nodejs_version -eq "0.10") {
npm -g install npm@3
npm -g install npm@2
$env:PATH="$env:APPDATA\npm;$env:PATH"
}
- SET "PATH=C:\Ruby%ruby_folder_version%\bin;%PATH%"
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
"which": "^1.0.5"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
"grunt": "^1.0.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-internal": "^0.4.10",
"grunt-contrib-internal": "^1.1.0",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-nodeunit": "^1.0.0"
},
Expand Down

2 comments on commit 4d56455

@XhmikosR
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shama: I think the sass/compass plugins are the only ones with custom CI stuff. We'll see how it goes for the rest.

@XhmikosR
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a side note, I'm thinking, we might need to install sass 3.4 since 3.5 won't work on Ruby 1.9.3 which is the default the Travis image has. But we'll see that in the future too, if it breaks.

Please sign in to comment.