Skip to content

Commit f9953f2

Browse files
authored
fix: build isn't using the right version on 32x (#1564)
1 parent 4ed5182 commit f9953f2

3 files changed

Lines changed: 21 additions & 10 deletions

File tree

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,21 @@ matrix:
3737
env: TRAVIS_NODE_VERSION="9" ARCH="x86"
3838
- os: osx
3939
env: TRAVIS_NODE_VERSION="10" ARCH="x86"
40+
- os: linux
41+
env: TRAVIS_NODE_VERSION="10" ARCH="x86"
4042

4143
before_install:
4244

4345
# download node if testing x86 architecture
46+
- nvm install $TRAVIS_NODE_VERSION
4447
- >
4548
if [[ "$ARCH" == "x86" ]]; then
4649
BASE_URL=$(node -p "'https://nodejs.org/dist/' + process.version");
4750
X86_FILE=$(node -p "'node-' + process.version + '-' + process.platform + '-x86'");
4851
wget $BASE_URL/$X86_FILE.tar.gz;
4952
tar -xf $X86_FILE.tar.gz;
5053
nvm deactivate;
51-
export PATH=$X86_FILE/bin:$PATH;
52-
else
53-
nvm install $TRAVIS_NODE_VERSION
54+
export PATH=`pwd`/$X86_FILE/bin:$PATH;
5455
fi;
5556
5657
# use g++-4.8 on Linux

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ In addition to reading the [article mentioned above](http://www.voodootikigod.co
8585

8686
| Platform / Arch | Node v4.x | Node v6.x | Node v8.x | Node v9.x | Node v10.x |
8787
| --- | --- | --- | --- | --- | --- |
88-
| Linux / ia32 ||||| |
88+
| Linux / ia32 ||||| |
8989
| Linux / x64 ||||||
9090
| Linux / ARM v6¹ ||||||
9191
| Linux / ARM v7¹ ||||||

docs/index.html

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ <h3>Platform Support</h3><p><code>serialport</code> supports NodeJS v4 and upwar
122122
<th>Node v6.x</th>
123123
<th>Node v8.x</th>
124124
<th>Node v9.x</th>
125+
<th>Node v10.x</th>
125126
</tr>
126127
</thead>
127128
<tbody>
@@ -130,77 +131,86 @@ <h3>Platform Support</h3><p><code>serialport</code> supports NodeJS v4 and upwar
130131
<td></td>
131132
<td></td>
132133
<td></td>
134+
<td></td>
133135
<td></td>
134136
</tr>
135137
<tr>
136138
<td>Linux / x64</td>
137139
<td></td>
138140
<td></td>
139141
<td></td>
140-
<td></td>
142+
<td></td>
143+
<td></td>
141144
</tr>
142145
<tr>
143146
<td>Linux / ARM v6¹</td>
144147
<td></td>
145148
<td></td>
146149
<td></td>
147150
<td></td>
151+
<td></td>
148152
</tr>
149153
<tr>
150154
<td>Linux / ARM v7¹</td>
151155
<td></td>
152156
<td></td>
153157
<td></td>
154158
<td></td>
159+
<td></td>
155160
</tr>
156161
<tr>
157162
<td>Linux / ARM v8¹</td>
158163
<td></td>
159164
<td></td>
160165
<td></td>
161166
<td></td>
167+
<td></td>
162168
</tr>
163169
<tr>
164170
<td>Linux / MIPSel¹</td>
165171
<td></td>
166172
<td></td>
167173
<td></td>
168174
<td></td>
175+
<td></td>
169176
</tr>
170177
<tr>
171178
<td>Linux / PPC64¹</td>
172179
<td></td>
173180
<td></td>
174181
<td></td>
175182
<td></td>
183+
<td></td>
176184
</tr>
177185
<tr>
178186
<td>Windows² / x86</td>
179187
<td></td>
180188
<td></td>
181189
<td></td>
182-
<td></td>
190+
<td></td>
191+
<td></td>
183192
</tr>
184193
<tr>
185194
<td>Windows² / x64</td>
186195
<td></td>
187196
<td></td>
188197
<td></td>
189-
<td></td>
198+
<td></td>
199+
<td></td>
190200
</tr>
191201
<tr>
192202
<td>OSX³ / x64</td>
193203
<td></td>
194204
<td></td>
195205
<td></td>
196-
<td></td>
206+
<td></td>
207+
<td></td>
197208
</tr>
198209
</tbody>
199210
</table>
200211
<p>¹ ARM, MIPSel and PPC64¹ platforms are not currently part of our testing or build matrix, but are known to work.</p>
201212
<p>² Windows 7, 8, 10, and 10 IoT are supported, but our CI tests only Windows Server 2012 R2.</p>
202213
<p>³ OSX 10.4 Tiger and above are supported, but our CI tests only 10.9.5 Mavericks with Xcode 6.1.</p>
203-
<p>⁴ Node 9 is not supported but we're providing builds for it.</p>
204214
<h2>Installation Instructions</h2><p>For most &quot;standard&quot; use cases (Node v4.x on Mac, Linux, or Windows on a x86 or x64 processor), Node-Serialport will install nice and easy with:</p>
205215
<pre class="prettyprint source"><code>npm install serialport</code></pre><h3>Installation Special Cases</h3><p>We use <a href="https://github.com/mafintosh/prebuild">prebuild</a> to compile and post binaries of the library for most common use cases (Linux, Mac, Windows on standard processor platforms). If you have a special case, Node-Serialport will work, but it will compile the binary during the install. Compiling with nodejs is done via <code>node-gyp</code> which requires Python 2.x, so please ensure you have it installed and in your path for all operating systems. Python 3.x will not work.</p>
206216
<p>This assumes you have everything on your system necessary to compile ANY native module for Node.js. If you don't, then please ensure the following are true for your system before filing a &quot;Does not install&quot; issue.</p>
@@ -480,7 +490,7 @@ <h3>Serial Port List</h3><p><code>serialport-list</code> will list all available
480490
<br class="clear">
481491

482492
<footer>
483-
Documentation generated at Sun Apr 15 2018 22:06:31 GMT-0400 (EDT)
493+
Documentation generated at Sun May 06 2018 01:37:34 GMT-0400 (EDT)
484494
</footer>
485495

486496
<script>prettyPrint();</script>

0 commit comments

Comments
 (0)