Skip to content

Commit e96119b

Browse files
committed
Fix x86 release builds; build for abi 45 and 46 as well as 44.
1 parent 7f616c4 commit e96119b

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
node_modules
22
lib/binding
33
build
4+
*-x86
5+
*-ia32

.jscsrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"build/**",
1111
"clean/**",
1212
"deps/**",
13-
"node_modules/**"
13+
"node_modules/**",
14+
"*-x86/**",
15+
"*-ia32/**"
1416
]
1517
}

.jshintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ build
22
clean
33
deps
44
node_modules
5+
*-x86
6+
*-ia32

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ addons:
1717
- g++-5-multilib
1818
- linux-libc-dev:i386
1919
- libxml2-dev:i386
20+
- zlib1g-dev:i386
2021

2122
## don't re-build for tags so that [publish binary] is not re-run
2223
## https://github.com/travis-ci/travis-ci/issues/1532
@@ -30,7 +31,9 @@ matrix:
3031
# Linux
3132
- os: linux
3233
compiler: clang
33-
env: NODE_VERSION="4.1.2" # node abi 46
34+
env: NODE_VERSION="4.1.2" PUBLISHABLE=false
35+
- os: linux
36+
env: NODE_VERSION="4.1.2" BUILD_X86=true # node abi 46
3437
# Test in release mode, not just debug mode.
3538
- os: linux
3639
compiler: clang
@@ -40,7 +43,9 @@ matrix:
4043
env: NODE_VERSION="4.0.0" PUBLISHABLE=false
4144
- os: linux
4245
compiler: clang
43-
env: NODE_VERSION="iojs-v3.3.1" # node abi 45
46+
env: NODE_VERSION="iojs-v3.3.1" PUBLISHABLE=false
47+
- os: linux
48+
env: NODE_VERSION="iojs-v3.3.1" BUILD_X86=true # node abi 45
4449
- os: linux
4550
compiler: clang
4651
env: NODE_VERSION="iojs-v3.1.0" PUBLISHABLE=false

0 commit comments

Comments
 (0)