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
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,22 @@ matrix:
apt:
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="2.0.1"
- os: osx
compiler: clang
env: NODE_VERSION="6" ELECTRON_VERSION="1.8.4"
- os: osx
compiler: clang
env: NODE_VERSION="6" ELECTRON_VERSION="1.7.12"
- os: osx
compiler: clang
env: NODE_VERSION="6" ELECTRON_VERSION="1.6.2"
- os: osx
compiler: clang
env: NODE_VERSION="6" ELECTRON_VERSION="1.3.14"

env:
global:
Expand Down
7 changes: 6 additions & 1 deletion scripts/build_against_electron.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ function publish() {
function electron_pretest() {
npm install -g electron@${ELECTRON_VERSION}
npm install -g electron-mocha
sh -e /etc/init.d/xvfb start
if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
(sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )&
else
sh -e /etc/init.d/xvfb start
fi

sleep 3
}

Expand Down