Windows CI matrix and version bumps

This commit is contained in:
Lovell Fuller 2015-05-05 10:15:20 +01:00
parent 33782d3c83
commit 3ffe2ba17f
4 changed files with 30 additions and 20 deletions

View File

@ -2,7 +2,8 @@ language: node_js
node_js: node_js:
- "0.10" - "0.10"
- "0.12" - "0.12"
- iojs - "iojs-v1"
- "iojs-v2"
before_install: before_install:
- curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash - - curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -
after_success: after_success:

View File

@ -2,9 +2,18 @@ os: Visual Studio 2014 CTP4
platform: Win32 platform: Win32
configuration: Release configuration: Release
environment: environment:
VIPS_VERSION_MAJOR_MINOR: 7.42 VIPS_VERSION_MAJOR_MINOR: 8.0
VIPS_VERSION_PATCH: 3 VIPS_VERSION_PATCH: 0
VIPS_WARNING: 0 VIPS_WARNING: 0
matrix:
- nodejs_version: "0.10"
nodejs_exec: "node"
- nodejs_version: "0.12"
nodejs_exec: "node"
- nodejs_version: "1.0"
nodejs_exec: "iojs"
- nodejs_version: "2.0"
nodejs_exec: "iojs"
install: install:
- ps: $env:VIPS_VERSION = "$env:VIPS_VERSION_MAJOR_MINOR.$env:VIPS_VERSION_PATCH" - ps: $env:VIPS_VERSION = "$env:VIPS_VERSION_MAJOR_MINOR.$env:VIPS_VERSION_PATCH"
- ps: Write-Output "Fetching http://www.vips.ecs.soton.ac.uk/supported/$env:VIPS_VERSION_MAJOR_MINOR/win32/vips-dev-$env:VIPS_VERSION.zip" - ps: Write-Output "Fetching http://www.vips.ecs.soton.ac.uk/supported/$env:VIPS_VERSION_MAJOR_MINOR/win32/vips-dev-$env:VIPS_VERSION.zip"
@ -12,7 +21,7 @@ install:
- ps: Invoke-Expression "& 7z -y x c:\vips-dev-$env:VIPS_VERSION.zip -oc:\ | FIND /V `"ing `"" - ps: Invoke-Expression "& 7z -y x c:\vips-dev-$env:VIPS_VERSION.zip -oc:\ | FIND /V `"ing `""
- ps: $env:VIPS_HOME = "c:\vips-dev-$env:VIPS_VERSION" - ps: $env:VIPS_HOME = "c:\vips-dev-$env:VIPS_VERSION"
- ps: $env:PATH = "$env:VIPS_HOME\bin;$env:PATH" - ps: $env:PATH = "$env:VIPS_HOME\bin;$env:PATH"
- ps: Install-Product node 0 x86 - ps: Install-Product node $env:nodejs_version x86
- npm install --arch=ia32 --msvs_version=2013 - npm install --arch=ia32 --msvs_version=2013
test_script: test_script:
- npm run-script test-win32-node - npm run-script test-win32-$env:nodejs_exec

View File

@ -1,6 +1,6 @@
{ {
"name": "sharp", "name": "sharp",
"version": "0.10.0", "version": "0.10.1",
"author": "Lovell Fuller <npm@lovell.info>", "author": "Lovell Fuller <npm@lovell.info>",
"contributors": [ "contributors": [
"Pierre Inglebert <pierre.inglebert@gmail.com>", "Pierre Inglebert <pierre.inglebert@gmail.com>",
@ -20,9 +20,9 @@
], ],
"description": "High performance Node.js module to resize JPEG, PNG, WebP and TIFF images using the libvips library", "description": "High performance Node.js module to resize JPEG, PNG, WebP and TIFF images using the libvips library",
"scripts": { "scripts": {
"test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=15000 ./test/unit/*.js", "test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=20000 ./test/unit/*.js",
"test-win32-node": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=15000 ./test/unit/*.js", "test-win32-node": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=20000 ./test/unit/*.js",
"test-win32-iojs": "iojs ./node_modules/mocha/bin/mocha --slow=5000 --timeout=15000 ./test/unit/*.js" "test-win32-iojs": "iojs ./node_modules/mocha/bin/mocha --slow=5000 --timeout=20000 ./test/unit/*.js"
}, },
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@ -42,19 +42,19 @@
"vips" "vips"
], ],
"dependencies": { "dependencies": {
"bluebird": "^2.9.24", "bluebird": "^2.9.25",
"color": "^0.8.0", "color": "^0.8.0",
"nan": "^1.7.0", "nan": "^1.8.4",
"semver": "^4.3.3" "semver": "^4.3.4"
}, },
"devDependencies": { "devDependencies": {
"mocha": "^2.2.4", "async": "^0.9.0",
"mocha-jshint": "^2.2.0",
"istanbul": "^0.3.13",
"coveralls": "^2.11.2", "coveralls": "^2.11.2",
"istanbul": "^0.3.13",
"mocha": "^2.2.4",
"mocha-jshint": "^2.2.2",
"node-cpplint": "^0.4.0", "node-cpplint": "^0.4.0",
"rimraf": "^2.3.2", "rimraf": "^2.3.3"
"async": "^0.9.0"
}, },
"license": "Apache 2.0", "license": "Apache 2.0",
"engines": { "engines": {

View File

@ -13,12 +13,12 @@
# * Amazon Linux 2014.09 # * Amazon Linux 2014.09
vips_version_minimum=7.40.0 vips_version_minimum=7.40.0
vips_version_latest_major_minor=7.42 vips_version_latest_major_minor=8.0
vips_version_latest_patch=3 vips_version_latest_patch=1
openslide_version_minimum=3.4.0 openslide_version_minimum=3.4.0
openslide_version_latest_major_minor=3.4 openslide_version_latest_major_minor=3.4
openslide_version_latest_patch=0 openslide_version_latest_patch=1
install_libvips_from_source() { install_libvips_from_source() {
echo "Compiling libvips $vips_version_latest_major_minor.$vips_version_latest_patch from source" echo "Compiling libvips $vips_version_latest_major_minor.$vips_version_latest_patch from source"