diff options
-rw-r--r-- | .travis.yml | 10 | ||||
-rw-r--r-- | package-lock.json | 2 | ||||
-rw-r--r-- | package.json | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 43e7fda20..56fc094e4 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -32,13 +32,15 @@ before_install: | |||
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 --no-edit source/develop |
35 | changes=$(git diff --stat HEAD origin/nightly | wc -l) | 35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) |
36 | if [ $changes -eq 0 ]; then | 36 | echo $TRAVIS_EVENT_TYPE |
37 | echo $changes | ||
38 | if [ $CHANGES_COUNT -eq 0 -a $TRAVIS_EVENT_TYPE == "cron" ]; then | ||
37 | travis_terminate 0; | 39 | travis_terminate 0; |
38 | else | 40 | else |
39 | git submodule update --remote --force | 41 | git submodule update --remote --force |
40 | git add . | 42 | git add . |
41 | git commit -m "Update submodules" | 43 | git diff-index --quiet HEAD || git commit -m "Update submodules" |
42 | fi | 44 | fi |
43 | fi | 45 | fi |
44 | install: | 46 | install: |
@@ -50,11 +52,13 @@ before_script: | |||
50 | script: | 52 | script: |
51 | - | | 53 | - | |
52 | if [ $TRAVIS_BRANCH == "release" ]; then | 54 | if [ $TRAVIS_BRANCH == "release" ]; then |
55 | echo "Building..." | ||
53 | travis_retry travis_wait 100 npm run build | 56 | travis_retry travis_wait 100 npm run build |
54 | fi | 57 | fi |
55 | - | | 58 | - | |
56 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 59 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
57 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" | 60 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
61 | echo "Building..." | ||
58 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 62 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |
59 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 63 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
60 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 64 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
diff --git a/package-lock.json b/package-lock.json index 4d76226c5..2ec76b2c1 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "version": "5.6.0-nightly.0", | 3 | "version": "5.6.0-nightly.1", |
4 | "lockfileVersion": 1, | 4 | "lockfileVersion": 1, |
5 | "requires": true, | 5 | "requires": true, |
6 | "dependencies": { | 6 | "dependencies": { |
diff --git a/package.json b/package.json index 95e6b1b85..2bc0c89c9 100644 --- a/package.json +++ b/package.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "desktopName": "ferdi.desktop", | 4 | "desktopName": "ferdi.desktop", |
5 | "appId": "com.kytwb.ferdi", | 5 | "appId": "com.kytwb.ferdi", |
6 | "version": "5.6.0-nightly.0", | 6 | "version": "5.6.0-nightly.1", |
7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
8 | "copyright": "kytwb", | 8 | "copyright": "kytwb", |
9 | "main": "index.js", | 9 | "main": "index.js", |