diff options
author | Amine Mouafik <amine@mouafik.fr> | 2021-01-06 07:02:20 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2021-01-06 07:02:20 +0100 |
commit | 6aeae690eb863fdb7418328cb5d24d9bfd46065f (patch) | |
tree | c0ba32c7fbe906cbdf3721061325c973a347b8c2 /.travis.yml | |
parent | Add new setting to minimize to tray when closing on Windows (#1093) (diff) | |
download | ferdium-app-6aeae690eb863fdb7418328cb5d24d9bfd46065f.tar.gz ferdium-app-6aeae690eb863fdb7418328cb5d24d9bfd46065f.tar.zst ferdium-app-6aeae690eb863fdb7418328cb5d24d9bfd46065f.zip |
5.6.0-nightly.13
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d5f1dd0c0..80b9dedd1 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -31,7 +31,7 @@ before_install: | |||
31 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 31 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
33 | git fetch source | 33 | git fetch source |
34 | git merge --no-ff --commit --no-edit source/develop | 34 | git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop |
35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) | 35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) |
36 | echo $TRAVIS_EVENT_TYPE | 36 | echo $TRAVIS_EVENT_TYPE |
37 | echo $changes | 37 | echo $changes |
@@ -40,7 +40,7 @@ before_install: | |||
40 | else | 40 | else |
41 | git submodule update --remote --force | 41 | git submodule update --remote --force |
42 | git add . | 42 | git add . |
43 | git diff-index --quiet HEAD || git commit -m "Update submodules" | 43 | git commit -m "Update submodules [skip ci]" || true |
44 | fi | 44 | fi |
45 | fi | 45 | fi |
46 | install: | 46 | install: |
@@ -57,6 +57,8 @@ script: | |||
57 | fi | 57 | fi |
58 | - | | 58 | - | |
59 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 59 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
60 | git add . | ||
61 | git commit -m "Apply linter fixes [skip ci]" | ||
60 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" | 62 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
61 | echo "Building..." | 63 | echo "Building..." |
62 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 64 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |