From a91f3e75e819c8ca7fcbe7927c90f4deb100c14b Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Thu, 6 May 2021 22:18:21 +0530 Subject: Run complete PR builds for osx and linux (#1361) Also the PR builds run for both linux and macos. --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 2ca8bcfaa..285320492 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ matrix: - ELECTRON_CACHE=$HOME/.cache/electron - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - os: osx - if: branch IN (nightly, release) osx_image: xcode12.2 env: - ELECTRON_CACHE=$HOME/.cache/electron @@ -63,23 +62,19 @@ install: - travis_retry npm install node-sass -g || travis_terminate 1 before_script: - npm run lint && npm run test || travis_terminate 1 - - echo $pwd - - chown -R `whoami` . - - rm -rfv ./build ./out script: - | + echo "Building for branch: $TRAVIS_BRANCH" if [ $TRAVIS_BRANCH == "release" ]; then - echo "Building for release..." travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi -c.mac.identity=null || travis_terminate 1 - fi - - | - if [ $TRAVIS_BRANCH == "nightly" ]; then + elif [ $TRAVIS_BRANCH == "nightly" ]; then git commit -am "Apply linter fixes [skip ci]" npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" || travis_terminate 1 - echo "Building for nightly..." travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies || travis_terminate 1 if [ $TRAVIS_OS_NAME == "osx" ]; then git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 git push -qu nightly HEAD:nightly >/dev/null 2>&1 fi + else + travis_retry travis_wait 100 npm run build || travis_terminate 1 fi -- cgit v1.2.3-70-g09d2