Skip to content

Commit

Permalink
Merge fb7ad26 into 739178d
Browse files Browse the repository at this point in the history
  • Loading branch information
kondi committed Oct 5, 2016
2 parents 739178d + fb7ad26 commit 57229cf
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
10 changes: 9 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ build: off
platform: x64
environment:
VIPS_WARNING: 0
node_pre_gyp_accessKeyId:
secure: FZqYCWy6PGfdCY6lUMMwurrstrVJWFl+0a4mSas/JZo=
node_pre_gyp_secretAccessKey:
secure: x961+zy88oXOB9rM+uT0gzjy+2ToB699qDVwf6HTsENsiOTdFMT6I3tCbzWiLI+0
matrix:
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "6"
install:
- ps: Install-Product node $env:nodejs_version x64
- npm install -g npm@latest
- npm install
- npm install --build-from-source
test_script:
- npm run-script test-win
on_success:
- .\node_modules\.bin\node-pre-gyp package
- SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
- if not "%CM%" == "%CM:[publish binary]=%" .\node_modules\.bin\node-pre-gyp --msvs_version=2013 publish
12 changes: 11 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,20 @@
"description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP and TIFF images",
"scripts": {
"clean": "rm -rf node_modules/ build/ include/ lib/ coverage/ test/fixtures/output.*",
"preinstall": "npm install node-pre-gyp",
"install": "node-pre-gyp install --fallback-to-build",
"test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=30000 ./test/unit/*.js",
"test-win": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=60000 ./test/unit/*.js",
"test-leak": "./test/leak/leak.sh",
"test-packaging": "./packaging/test-linux-x64.sh",
"test-clean": "rm -rf coverage/ test/fixtures/output.* && npm install && npm test"
},
"binary": {
"module_name" : "sharp",
"module_path" : "./build/{configuration}/",
"remote_path" : "./{module_name}/v{version}/{configuration}/",
"host" : "https://kondi-sharp.s3.amazonaws.com"
},
"main": "index.js",
"repository": {
"type": "git",
Expand All @@ -62,12 +70,14 @@
"bluebird": "^3.4.1",
"color": "^0.11.3",
"nan": "^2.4.0",
"semver": "^5.3.0",
"node-pre-gyp": "^0.6.30",
"request": "^2.74.0",
"semver": "^5.3.0",
"tar": "^2.2.1"
},
"devDependencies": {
"async": "^2.0.1",
"aws-sdk": "^2.6.6",
"bufferutil": "^1.2.1",
"coveralls": "^2.11.12",
"exif-reader": "^1.0.1",
Expand Down

0 comments on commit 57229cf

Please sign in to comment.