Skip to content

Commit a95463a

Browse files
committed
Use --target instead of building with each node version
1 parent b5aea29 commit a95463a

File tree

6 files changed

+7
-18
lines changed

6 files changed

+7
-18
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ osx_image: xcode9.3
99
install:
1010
- export PREBUILD_SLUG=$TRAVIS_REPO_SLUG
1111
- export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig" #node-gfx/node-canvas-prebuilt#76
12+
- >-
13+
source ~/.nvm/nvm.sh
14+
nvm use 10 || { nvm install 10; nvm use 10; }
15+
npm install -g node-gyp
1216
- >- # this should only run on linux
1317
if [ $TRAVIS_OS_NAME = "linux" ]; then
1418

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 0.0.{build}
22
image: Visual Studio 2017
33
install:
4-
- ps: Install-Product node 8 x64
4+
- ps: Install-Product node 10 x64
55
- set PREBUILD_SLUG=%APPVEYOR_REPO_NAME%
66
- npm install -g npm node-gyp
77
- set "PATH=%APPDATA%\npm;%PATH%"

ci/install.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ source ci/$OS/preinstall.sh
3232
cp ci/$OS/binding.gyp node-canvas/binding.gyp
3333

3434
for ver in $NODEJS_VERSIONS; do
35-
echo "------------ Building with node $ver ------------"
36-
37-
source ci/$OS/node_version.sh $ver;
35+
echo "------------ Building for node $ver ------------"
3836

3937
cd node-canvas
4038

41-
node-gyp rebuild || {
39+
node-gyp rebuild --target=$ver || {
4240
echo "error building in nodejs version $ver"
4341
exit 1;
4442
}
@@ -56,7 +54,6 @@ for ver in $NODEJS_VERSIONS; do
5654
done;
5755

5856
echo "------------ Releasing with release.js ------------"
59-
source ci/$OS/node_version.sh 11
6057
node ci/release.js $PREBUILD_VERSION || exit 1;
6158

6259
cd ..

ci/linux/node_version.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

ci/osx/node_version.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

ci/win/node_version.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)