diff --git a/.travis.yml b/.travis.yml index 198fba538..3a945796a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" @@ -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 diff --git a/appveyor.yml b/appveyor.yml index f32de99f7..eb8b99c62 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 5ec086079..bb0205cbf 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -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 diff --git a/scripts/install_node.sh b/scripts/install_node.sh index d534f77a5..d1ae0670e 100755 --- a/scripts/install_node.sh +++ b/scripts/install_node.sh @@ -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 \ No newline at end of file +which node