From 18433c2c9e1617328b0e7784ae8ba9cb646191db Mon Sep 17 00:00:00 2001 From: seanyesmunt Date: Wed, 30 May 2018 03:23:14 -0400 Subject: [PATCH] fix build --- .travis.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 473dc35d6..7997139a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,19 @@ matrix: include: - os: osx + env: TARGET=mac osx_image: xcode9.2 language: node_js node_js: "9" - env: - - ELECTRON_CACHE=$HOME/.cache/electron - - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - os: linux + env: TARGET=windows services: docker language: node_js node_js: "9" + - os: linux + env: TARGET=linux + language: node_js + node_js: "9" cache: false before_install: - | @@ -20,6 +23,7 @@ before_install: else sudo apt-get -qq update sudo apt-get install -y libsecret-1-dev + sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.6.0 export PATH="$HOME/.yarn/bin:$PATH" fi @@ -27,17 +31,15 @@ before_script: - git lfs pull script: - | - if [ "$TRAVIS_OS_NAME" == "linux" ]; then + if [ "$TARGET" == "windows" ]; then docker run --rm \ --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \ -v ${PWD}:/project \ - -v ~/.cache/electron:/root/.cache/electron \ - -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ - /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn build --linux --win --publish onTag" - else - yarn build --publish onTag + /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn build --win --publish onTag"; fi + - if [ "$TARGET" == "mac" ]; then yarn build --publish onTag; fi + - if [ "$TARGET" == "linux" ]; then yarn --link-duplicates --pure-lockfile && yarn build --linux --publish onTag; fi branches: except: - "/^v\\d+\\.\\d+\\.\\d+$/"