From 131554274ac8c8f8af816212876f8bd18b811489 Mon Sep 17 00:00:00 2001 From: edgarsilva Date: Tue, 24 Feb 2015 17:51:12 -0600 Subject: [PATCH 1/2] Fix issue with travis-ci pre-compiled binaries using a really old opencv version. --- .travis.yml | 16 ++++++---------- package.json | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5101789..8cd4a3d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -9,19 +9,15 @@ compiler: clang env: global: - - secure: "kCAwXdfcMv4l4ok5lO89ANbKXXwWQpn5/3qupSbhmX2NDIGUxyXze/cs90u9gF5hcT7ebq27ZJPEtu7pRov8MadfQM9BAd4ZZrHcMHWSkA0Iz+nM+m0Urwach6jkp2Iuwx15L2NHSis7f5PUKJcEv4Gnqs8jrCJzHHS7m7dO0Xo=" - - secure: "lBIk4BhdIkSmJtFUNp93UjDm445i9eF7nKA+oSiLRu+b9i/WeRLiKFI89tehexWeXBlyNhziBN16LrHmx3I86yZfEok9dBMA1JuzYBjrvpjRAflGcqaCFLV3axyyyNQRIh7Q+ziAlg0xg8HL752BpnfXO91g3jfDPjGxcvBb5xQ=" - - + - secure: "kCAwXdfcMv4l4ok5lO89ANbKXXwWQpn5/3qupSbhmX2NDIGUxyXze/cs90u9gF5hcT7ebq27ZJPEtu7pRov8MadfQM9BAd4ZZrHcMHWSkA0Iz+nM+ + - secure: "lBIk4BhdIkSmJtFUNp93UjDm445i9eF7nKA+oSiLRu+b9i/WeRLiKFI89tehexWeXBlyNhziBN16LrHmx3I86yZfEok9dBMA1JuzYBjrvpjRAflGc before_install: # Fix a problem with apt-get failing later, see http://docs.travis-ci.com/user/installing-dependencies/#Installing-Ubuntu-packages - sudo apt-get update -qq - # - sudo add-apt-repository -y ppa:kubuntu-ppa/backports - # - sudo apt-get update - - sudo apt-get install libcv-dev - - sudo apt-get install libopencv-dev - - sudo apt-get install libhighgui-dev + - sudo add-apt-repository -y ppa:kubuntu-ppa/backports + - sudo apt-get update + - sudo apt-get install --force-yes libcv-dev libcvaux-dev libhighgui-dev libopencv-dev # get commit message - COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') # put local node-pre-gyp on PATH @@ -50,7 +46,7 @@ install: before_script: - echo "Publishing native platform Binary Package? ->" $PUBLISH_BINARY # if publishing, do it - - if [[ $PUBLISH_BINARY == true ]]; then node-pre-gyp package publish || true ; fi; + - if [[ $PUBLISH_BINARY == true ]]; then node-pre-gyp package publish || true; fi; # cleanup - node-pre-gyp clean - node-gyp clean diff --git a/package.json b/package.json index f136a9f..00d13d6 100755 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "buffers": "0.1.1", "nan": "1.4.3" }, - "version": "3.0.0", + "version": "3.0.1", "devDependencies": { "tape": "^3.0.0", "aws-sdk": "~2.0.21", From a872bcf9c4d35f245188c8444ddfae10ea2d36ed Mon Sep 17 00:00:00 2001 From: edgarsilva Date: Tue, 24 Feb 2015 18:00:27 -0600 Subject: [PATCH 2/2] Fix incorrect secure keys. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cd4a3d..f846ea2 100755 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,9 @@ compiler: clang env: global: - - secure: "kCAwXdfcMv4l4ok5lO89ANbKXXwWQpn5/3qupSbhmX2NDIGUxyXze/cs90u9gF5hcT7ebq27ZJPEtu7pRov8MadfQM9BAd4ZZrHcMHWSkA0Iz+nM+ - - secure: "lBIk4BhdIkSmJtFUNp93UjDm445i9eF7nKA+oSiLRu+b9i/WeRLiKFI89tehexWeXBlyNhziBN16LrHmx3I86yZfEok9dBMA1JuzYBjrvpjRAflGc + - secure: "kCAwXdfcMv4l4ok5lO89ANbKXXwWQpn5/3qupSbhmX2NDIGUxyXze/cs90u9gF5hcT7ebq27ZJPEtu7pRov8MadfQM9BAd4ZZrHcMHWSkA0Iz+nM+m0Urwach6jkp2Iuwx15L2NHSis7f5PUKJcEv4Gnqs8jrCJzHHS7m7dO0Xo=" + - secure: "lBIk4BhdIkSmJtFUNp93UjDm445i9eF7nKA+oSiLRu+b9i/WeRLiKFI89tehexWeXBlyNhziBN16LrHmx3I86yZfEok9dBMA1JuzYBjrvpjRAflGcqaCFLV3axyyyNQRIh7Q+ziAlg0xg8HL752BpnfXO91g3jfDPjGxcvBb5xQ=" + before_install: # Fix a problem with apt-get failing later, see http://docs.travis-ci.com/user/installing-dependencies/#Installing-Ubuntu-packages