Skip to content

Commit

Permalink
Merge pull request #355 from gruntjs/deps
Browse files Browse the repository at this point in the history
Update dependencies.
  • Loading branch information
kevva committed Apr 8, 2016
2 parents 2e9096a + 7fa79e7 commit 1065131
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 17 deletions.
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
sudo: false
language: node_js
node_js:
- '5'
- '4'
- '0.10'
- "0.10"
- "0.12"
- "4"
- "5"
- "iojs"
before_install:
- npm install -g npm
- if [ "$TRAVIS_NODE_VERSION" = "0.10" ]; then npm install -g npm@2; fi
matrix:
fast_finish: true
cache:
directories:
- node_modules
32 changes: 21 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,44 @@
# AppVeyor file
# http://www.appveyor.com/docs/appveyor-yml

version: "{build}"

clone_depth: 10

version: "{build}"

# What combinations to test
environment:
matrix:
- nodejs_version: "5"
- nodejs_version: "4"
- nodejs_version: "0.10"
platform: x86
- nodejs_version: "0.12"
platform: x86
- nodejs_version: "4"
platform: x64
- nodejs_version: "4"
platform: x86
- nodejs_version: "5"
platform: x86

install:
- ps: Install-Product node $env:nodejs_version
- ps: Install-Product node $env:nodejs_version $env:platform
- ps: >-
if ($env:nodejs_version -eq "0.10") {
npm -g install npm@2
$env:PATH="$env:APPDATA\npm;$env:PATH"
}
- npm install

build: off

test_script:
# Output useful info for debugging
- node --version && npm --version
- npm test
# We test multiple Windows shells because of prior stdout buffering issues
# filed against Grunt. https://github.com/joyent/node/issues/3584
- ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
- cmd: npm test

build: off

matrix:
fast_finish: true

cache:
- '%APPDATA%\npm\node_modules -> package.json' # global npm modules
- 'node_modules -> package.json' # local npm modules
- node_modules -> package.json
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"test": "grunt test"
},
"dependencies": {
"async": "^0.9.0",
"async": "^1.5.2",
"chalk": "^1.0.0",
"gulp-rename": "^1.2.0",
"imagemin": "^4.0.0",
"pretty-bytes": "^1.0.1"
"pretty-bytes": "^3.0.1"
},
"devDependencies": {
"grunt": "^1.0.0",
Expand Down

0 comments on commit 1065131

Please sign in to comment.