Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ install:

export PREBUILD_SLUG="$TRAVIS_REPO_SLUG";

bash ci/install.sh osx "$PREBUILD_VERSION" "$PREBUILD_CANVAS_VERSION" "$PREBUILD_NODE_VERSIONS";
bash -c 'export NVM_DIR=$HOME/.nvm; . $HOME/.nvm/nvm.sh; . ci/install.sh osx "$PREBUILD_VERSION" "$PREBUILD_CANVAS_VERSION" "$PREBUILD_NODE_VERSIONS"';

fi
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 0.0.{build}
image: Visual Studio 2017
install:
- ps: Install-Product node 8 x64
- ps: Install-Product node 10 x64
- set PREBUILD_SLUG=%APPVEYOR_REPO_NAME%
- npm install -g npm node-gyp
- set "PATH=%APPDATA%\npm;%PATH%"
Expand Down
7 changes: 2 additions & 5 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ source ci/$OS/preinstall.sh
cp ci/$OS/binding.gyp node-canvas/binding.gyp

for ver in $NODEJS_VERSIONS; do
echo "------------ Building with node $ver ------------"

source ci/$OS/node_version.sh $ver;
echo "------------ Building for node $ver ------------"

cd node-canvas

node-gyp rebuild || {
node-gyp rebuild --target=$ver || {
echo "error building in nodejs version $ver"
exit 1;
}
Expand All @@ -56,7 +54,6 @@ for ver in $NODEJS_VERSIONS; do
done;

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

cd ..
Expand Down
5 changes: 0 additions & 5 deletions ci/linux/node_version.sh

This file was deleted.

4 changes: 4 additions & 0 deletions ci/linux/preinstall.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# apt-get-style dependencies aren't done here since the
# linux build is done on a docker image that has them

nvm install node # latest
nvm use node # latest
npm install -g node-gyp

git clone git://anongit.gentoo.org/proj/pax-utils.git
cd pax-utils
PATH=$PATH:$PWD
Expand Down
5 changes: 0 additions & 5 deletions ci/osx/node_version.sh

This file was deleted.

4 changes: 4 additions & 0 deletions ci/osx/preinstall.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
nvm install node # latest
nvm use node # latest
npm install -g node-gyp

brew update
brew install cairo pango librsvg python3 # python3 is for macpack
brew upgrade python # activates python 3
Expand Down
2 changes: 0 additions & 2 deletions ci/win/node_version.sh

This file was deleted.