diff options
-rw-r--r-- | .travis.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 2ca8bcfaa..285320492 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -15,7 +15,6 @@ matrix: | |||
15 | - ELECTRON_CACHE=$HOME/.cache/electron | 15 | - ELECTRON_CACHE=$HOME/.cache/electron |
16 | - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder | 16 | - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder |
17 | - os: osx | 17 | - os: osx |
18 | if: branch IN (nightly, release) | ||
19 | osx_image: xcode12.2 | 18 | osx_image: xcode12.2 |
20 | env: | 19 | env: |
21 | - ELECTRON_CACHE=$HOME/.cache/electron | 20 | - ELECTRON_CACHE=$HOME/.cache/electron |
@@ -63,23 +62,19 @@ install: | |||
63 | - travis_retry npm install node-sass -g || travis_terminate 1 | 62 | - travis_retry npm install node-sass -g || travis_terminate 1 |
64 | before_script: | 63 | before_script: |
65 | - npm run lint && npm run test || travis_terminate 1 | 64 | - npm run lint && npm run test || travis_terminate 1 |
66 | - echo $pwd | ||
67 | - chown -R `whoami` . | ||
68 | - rm -rfv ./build ./out | ||
69 | script: | 65 | script: |
70 | - | | 66 | - | |
67 | echo "Building for branch: $TRAVIS_BRANCH" | ||
71 | if [ $TRAVIS_BRANCH == "release" ]; then | 68 | if [ $TRAVIS_BRANCH == "release" ]; then |
72 | echo "Building for release..." | ||
73 | 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 | 69 | 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 |
74 | fi | 70 | elif [ $TRAVIS_BRANCH == "nightly" ]; then |
75 | - | | ||
76 | if [ $TRAVIS_BRANCH == "nightly" ]; then | ||
77 | git commit -am "Apply linter fixes [skip ci]" | 71 | git commit -am "Apply linter fixes [skip ci]" |
78 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" || travis_terminate 1 | 72 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" || travis_terminate 1 |
79 | echo "Building for nightly..." | ||
80 | 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 | 73 | 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 |
81 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 74 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
82 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 75 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
83 | git push -qu nightly HEAD:nightly >/dev/null 2>&1 | 76 | git push -qu nightly HEAD:nightly >/dev/null 2>&1 |
84 | fi | 77 | fi |
78 | else | ||
79 | travis_retry travis_wait 100 npm run build || travis_terminate 1 | ||
85 | fi | 80 | fi |