diff --git a/.travis.yml b/.travis.yml index cb8683715..0d435f9c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/scripts/build_against_electron.sh b/scripts/build_against_electron.sh index ac145b888..c3288b529 100755 --- a/scripts/build_against_electron.sh +++ b/scripts/build_against_electron.sh @@ -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 }