Skip to content

Commit

Permalink
Merge pull request #1241 from nodegit/fix-linux-32
Browse files Browse the repository at this point in the history
Fix linux 32-bit builds
  • Loading branch information
johnhaley81 committed Feb 28, 2017
2 parents 97ff2cd + d7e8b9e commit 450a337
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@ matrix:
include:
- os: linux
env: export NODE_VERSION="4" TARGET_ARCH="ia32"
sudo: required
- os: linux
env: export NODE_VERSION="6.5" TARGET_ARCH="ia32"
sudo: required
- os: linux
env: export NODE_VERSION="7.4" TARGET_ARCH="ia32"
sudo: required

git:
depth: 1
Expand All @@ -50,10 +47,6 @@ before_install:
- export npm_config_clang=1
- export JOBS=4

- if [ $TARGET_ARCH == "ia32" ]; then
sudo ln -s /usr/include/asm-generic /usr/include/asm;
fi

- if [ $TRAVIS_OS_NAME != "linux" ]; then
git clone https://github.com/creationix/nvm.git ./.nvm;
source ./.nvm/nvm.sh;
Expand Down Expand Up @@ -87,14 +80,10 @@ before_script:
- git config --global user.email johndoe@example.com

script:
- if [ $TARGET_ARCH == "x64" ]; then
if [ -z "$TRAVIS_TAG" ] && [ $TRAVIS_OS_NAME == "linux" ] && [ $NODE_VERSION == "6" ]; then
npm test && npm run cov && npm run coveralls;
else
npm test;
fi
if [ -z "$TRAVIS_TAG" ] && [ $TRAVIS_OS_NAME == "linux" ] && [ $NODE_VERSION == "6" ]; then
npm test && npm run cov && npm run coveralls;
else
echo "Not running tests because the binary is not built for 64-bit systems";
npm test;
fi

after_success:
Expand Down

0 comments on commit 450a337

Please sign in to comment.