diff options
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a52edcff5..2495cb229 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -52,7 +52,7 @@ before_install: | |||
52 | else | 52 | else |
53 | echo "Found changes, proceeding with submodule updates" | 53 | echo "Found changes, proceeding with submodule updates" |
54 | git submodule update --remote --force | 54 | git submodule update --remote --force |
55 | git commit -am "Update submodules [skip ci]" || true | 55 | git commit -am "Update submodules [skip ci]" --no-verify || true |
56 | fi | 56 | fi |
57 | echo "Completed merging from develop branch and upgrading submodules" | 57 | echo "Completed merging from develop branch and upgrading submodules" |
58 | fi | 58 | fi |
@@ -70,12 +70,12 @@ script: | |||
70 | if [ $TRAVIS_BRANCH == "release" ]; then | 70 | if [ $TRAVIS_BRANCH == "release" ]; then |
71 | 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 | 71 | 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 |
72 | elif [ $TRAVIS_BRANCH == "nightly" ]; then | 72 | elif [ $TRAVIS_BRANCH == "nightly" ]; then |
73 | git commit -am "Apply linter fixes [skip ci]" | 73 | git commit -am "Apply linter fixes [skip ci]" --no-verify |
74 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip ci]" || travis_terminate 1 | 74 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip ci]" || travis_terminate 1 |
75 | 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 | 75 | 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 |
76 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 76 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
77 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 77 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
78 | git push -qu nightly HEAD:nightly >/dev/null 2>&1 | 78 | git push -qu nightly HEAD:nightly --no-verify >/dev/null 2>&1 |
79 | fi | 79 | fi |
80 | else | 80 | else |
81 | if [ $TRAVIS_PULL_REQUEST_BRANCH != "i18n" ]; then | 81 | if [ $TRAVIS_PULL_REQUEST_BRANCH != "i18n" ]; then |