From 918bbe88c670f2c2e0286a851d35e84d9e142125 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 9 Sep 2015 22:18:22 +0100 Subject: [PATCH] Switch Travis to Ubuntu 14.04/GCE Remove v0.10 and custom msvs flag from Appveyor --- .travis.yml | 3 ++- appveyor.yml | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 745f3acd..0a62f9e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,10 @@ language: node_js node_js: - "0.10" - "0.12" - - "4" - "iojs-v2" - "iojs-v3" + - "4" +sudo: 9000 addons: apt: sources: diff --git a/appveyor.yml b/appveyor.yml index 19e8d3b1..a42a1940 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,16 +7,14 @@ environment: VIPS_VERSION_PATCH: 2 VIPS_WARNING: 0 matrix: - - nodejs_version: "0.10" - nodejs_exec: "node" - nodejs_version: "0.12" nodejs_exec: "node" - - nodejs_version: "4" - nodejs_exec: "node" - nodejs_version: "2" nodejs_exec: "iojs" - nodejs_version: "3" nodejs_exec: "iojs" + - nodejs_version: "4" + nodejs_exec: "node" install: - 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" @@ -25,6 +23,6 @@ install: - ps: $env:VIPS_HOME = "c:\vips-dev-$env:VIPS_VERSION" - ps: $env:PATH = "$env:VIPS_HOME\bin;$env:PATH" - ps: Install-Product node $env:nodejs_version x86 - - npm install --arch=ia32 --msvs_version=2013 + - npm install --arch=ia32 test_script: - npm run-script test-win32-%nodejs_exec%