Skip to content

Commit f5fca0a

Browse files
committed
travis fixes
1 parent 9f01b67 commit f5fca0a

File tree

3 files changed

+25
-10
lines changed

3 files changed

+25
-10
lines changed

.travis.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
os: linux
2-
dist: trusty
1+
os:
2+
- linux
3+
- osx
4+
35
language: node_js
46
node_js: 8
7+
sudo: false
8+
9+
matrix:
10+
allow_failures:
11+
- os: osx
12+
fast_finish: true
513

6-
env:
7-
- NO_PROXY=127.0.01,localhost
814
before_script:
915
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
1016
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
@@ -27,17 +33,16 @@ script:
2733
- npm run test
2834

2935
before_deploy:
30-
- sudo apt-get update
31-
- sudo apt-get install wine
3236
- npm run build
3337

3438
deploy:
3539
provider: releases
3640
api_key:
3741
secure: SaVLCQxO+jMOdS2WpVpgiA170Nkf3AM5ysVOknrUxei2oYnmUWQWvP3fs3bFXN2S9xoLVvrpYTeio803SErd26CpkHaMik6JSrBT5nWTIQNTXb+YXbzpuuZWRlsRGa2jYRLPqWCTJo2Y1enO0k9yaKsk0MkqhkfY3muja8dgRTQnW2R09ZoP9Iz1OgnGMkES2wlOkuOQUyZYJi0aU9KM0mzZh3H2Z27sSF8aOjbbAac4EqvPTRpKCviMjhAD3MX8+E2IcYfJmi/J8TN64/qhi5yKpBD6PB6A3zKlxhCtqiO2SO8dTBCUd74WdM+0xHTBwaBdwwJsTXVRwmZM3+MoYv4vkFBi1GrvEkXqckk/FnQzWstZf1kzadwU81mucxnjHNJT1OGtM0F4KpBzF3dBvca3FCg4ZuKL/f4l5YEtSKhACCLDB7aaZ8FtAonYIxhaArskvBZ3EhRRtKpwtfkEJ4b4/yuIr6j4PNXFP5bU8VAyTRuGD4ikDf+uyPQ3TF20EXHTtQxyZ16aNex7mOhAJRi/YrpbTmDzoEQHRWkSAnsgMSt8EHr0Z/l10Egjh5XC1RMdUSCxjHU+LRuskuueOXKAc1NYvtEc3bpDYU0Ywc/drTmkSsyVbCtBcxnlMllEaLe8qZqCk225328ayUFvmWK/jl6n83aeLjvejU8NtLQ=
3842
file:
39-
- dist/h2-*.dmg
40-
- dist/h2-*.AppImage
41-
- dist/h2-*.exe
43+
- "dist/h2-*.dmg"
44+
- "dist/h2-*.AppImage"
45+
- "dist/h2-*.exe"
4246
on:
4347
tags: true
48+
condition: $TRAVIS_OS_NAME = osx

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "src/main.js",
66
"scripts": {
77
"start": "electron .",
8-
"build": "electron-builder --win --linux --mac",
8+
"build": "electron-builder --win --linux --mac -p never",
99
"lint": "eslint ./src/**/*.js ./tests/**/*.js",
1010
"lint:fix": "eslint ./src/**/*.js ./tests/**/*.js --fix",
1111
"test": "mocha tests/spec.js --timeout 30000"

scripts/build-dist.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
4+
5+
# Install some custom requirements on OS X
6+
# e.g. brew install pyenv-virtualenv
7+
npm run build
8+
else
9+
# Install some custom requirements on Linux
10+
fi

0 commit comments

Comments
 (0)