diff --git a/.travis.yml b/.travis.yml index 198fba538..8747d0408 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,14 @@ addons: matrix: include: # Linux + - os: linux + compiler: clang + env: NODE_VERSION="12" + dist: xenial + 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 72 - os: osx compiler: clang env: NODE_VERSION="11" # node abi 67 @@ -108,6 +119,22 @@ matrix: compiler: clang env: NODE_VERSION="4" # node abi 46 # electron Linux + - os: linux + compiler: clang + env: NODE_VERSION="12" ELECTRON_VERSION="5.0.0" + dist: xenial # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise + 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="6" ELECTRON_VERSION="4.0.0" + dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise + 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="6" ELECTRON_VERSION="4.0.0" @@ -161,6 +188,9 @@ matrix: sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] packages: [ 'clang-3.5'] # electron MacOs + - os: osx + compiler: clang + env: NODE_VERSION="12" ELECTRON_VERSION="5.0.0" - os: osx compiler: clang env: NODE_VERSION="6" ELECTRON_VERSION="4.0.0" diff --git a/appveyor.yml b/appveyor.yml index f32de99f7..b3f3cedcc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,21 @@ environment: platform: x64 - nodejs_version: 11 platform: x86 + - nodejs_version: 12 + platform: x64 + - nodejs_version: 12 + platform: x86 # electron + - nodejs_version: 12 + platform: x64 + NODE_RUNTIME: electron + NODE_RUNTIME_VERSION: 5.0.0 + TOOLSET_ARGS: --dist-url=https://atom.io/download/electron + - nodejs_version: 12 + platform: x86 + NODE_RUNTIME: electron + NODE_RUNTIME_VERSION: 5.0.0 + TOOLSET_ARGS: --dist-url=https://atom.io/download/electron - nodejs_version: 10 platform: x64 NODE_RUNTIME: electron diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 362cf5bb0..ba23d457c 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -32,8 +32,10 @@ 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 +IF /I "%platform%"=="x64" powershell Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) x64 +IF /I "%platform%"=="x86" powershell Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) x86 +:: IF /I "%platform%"=="x64" powershell Install-Product node $env:nodejs_version x64 +:: IF /I "%platform%"=="x86" powershell Install-Product node $env:nodejs_version x86 IF %ERRORLEVEL% NEQ 0 GOTO ERROR powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force