Skip to content

Commit

Permalink
Merge pull request #1071 from mapbox/macos-electron-3
Browse files Browse the repository at this point in the history
add electron 3.0
  • Loading branch information
kewde committed Nov 9, 2018
2 parents c191e61 + 7988127 commit 321455e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Expand Up @@ -100,7 +100,7 @@ matrix:
# electron Linux
- os: linux
compiler: clang
env: NODE_VERSION="6" ELECTRON_VERSION="3.0.0-beta.1"
env: NODE_VERSION="6" ELECTRON_VERSION="3.0.6"
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
addons:
apt:
Expand Down Expand Up @@ -143,6 +143,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="6" ELECTRON_VERSION="3.0.6"
- os: osx
compiler: clang
env: NODE_VERSION="6" ELECTRON_VERSION="2.0.1"
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -34,12 +34,12 @@ environment:
- nodejs_version: 10
platform: x64
NODE_RUNTIME: electron
NODE_RUNTIME_VERSION: 3.0.0-beta.1
NODE_RUNTIME_VERSION: 3.0.6
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
- nodejs_version: 10
platform: x86
NODE_RUNTIME: electron
NODE_RUNTIME_VERSION: 3.0.0-beta.1
NODE_RUNTIME_VERSION: 3.0.6
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
- nodejs_version: 8
platform: x64
Expand Down

0 comments on commit 321455e

Please sign in to comment.