From 274c47fa1f2dc69db8d225c904af000ef57e09b9 Mon Sep 17 00:00:00 2001 From: develar Date: Thu, 24 Mar 2016 07:27:31 +0100 Subject: [PATCH] chore: use Xcode 7 (nvm preinstalled), don't install nsis on appveyour https://github.com/travis-ci/travis-ci/issues/2311#issuecomment-200597613 --- .travis.yml | 5 ++--- appveyor.yml | 1 - package.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9fe7d710a2..7d9b4f19b55 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ os: - osx - linux +osx_image: xcode7.3 + env: - NODE_VERSION=4 - NODE_VERSION=5.8 @@ -28,9 +30,6 @@ before_install: - gem install --no-rdoc --no-ri fpm install: -- rm -rf ~/.nvm -- git clone https://github.com/creationix/nvm.git ~/.nvm -- source ~/.nvm/nvm.sh - nvm install $NODE_VERSION - npm install npm -g - npm prune diff --git a/appveyor.yml b/appveyor.yml index 4d3a2c09f33..3c4ba31ea5a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,6 @@ init: - git config --global core.autocrlf false install: - - choco install nsis -y - ps: Install-Product node 5 x64 - npm install npm -g - node -v diff --git a/package.json b/package.json index b4d234d301b..b94f423f1f6 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "plist": "^1.2.0", "pre-commit": "^1.1.2", "semantic-release": "^4.3.5", - "should": "^8.2.2", + "should": "^8.3.0", "ts-babel": "^0.6.1", "tsconfig-glob": "^0.4.2", "tslint": "next",