Skip to content
Merged
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
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ addons:
matrix:
include:
# Linux
- os: linux
dist: xenial
compiler: clang
env: NODE_VERSION="12"
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
- os: linux
compiler: clang
env: NODE_VERSION="11"
Expand Down Expand Up @@ -83,6 +91,9 @@ matrix:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5','libsqlite3-dev']
# OS X
- os: osx
compiler: clang
env: NODE_VERSION="12" # node abi 67
- os: osx
compiler: clang
env: NODE_VERSION="11" # node abi 67
Expand Down
4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ environment:
platform: x64
- nodejs_version: 11
platform: x86
- nodejs_version: 12
platform: x64
- nodejs_version: 12
platform: x86
# electron
- nodejs_version: 10
platform: x64
Expand Down
3 changes: 1 addition & 2 deletions scripts/build-appveyor.bat
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ ECHO using MSBuild^: && CALL msbuild /version && ECHO.
IF %ERRORLEVEL% NEQ 0 GOTO ERROR

ECHO downloading/installing node
IF /I "%platform%"=="x64" powershell Install-Product node $env:nodejs_version x64
IF /I "%platform%"=="x86" powershell Install-Product node $env:nodejs_version x86
powershell Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:PLATFORM
IF %ERRORLEVEL% NEQ 0 GOTO ERROR

powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
Expand Down
4 changes: 2 additions & 2 deletions scripts/install_node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nvm unload || true
rm -rf ./__nvm/ && git clone --depth 1 https://github.com/creationix/nvm.git ./__nvm
source ./__nvm/nvm.sh
nvm install ${NODE_VERSION}
nvm use ${NODE_VERSION}
nvm use --delete-prefix ${NODE_VERSION}
node --version
npm --version
which node
which node