Skip to content

Fix linux 32-bit builds #1241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 2 commits into from
Feb 28, 2017
Merged

Fix linux 32-bit builds #1241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3fd303
Remove `sudo: required` from 32-bit linux builds
Feb 28, 2017
d7e8b9e
Add tests back in for 32-bit systems
Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions .travis.yml
View file
Open in desktop
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 [email protected]

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