diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-10-03 11:21:01 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-03 11:21:01 +0100 |
commit | 8194113a11baba8f7e9b37f64725b5d6cd0492e0 (patch) | |
tree | b2569e284bf4f6db61ecc3be3c8cab599c660f30 /.travis.yml | |
parent | Merge branch 'nightly' of github.com:getferdi/ferdi into nightly (diff) | |
download | ferdium-app-8194113a11baba8f7e9b37f64725b5d6cd0492e0.tar.gz ferdium-app-8194113a11baba8f7e9b37f64725b5d6cd0492e0.tar.zst ferdium-app-8194113a11baba8f7e9b37f64725b5d6cd0492e0.zip |
Include submodules update step, remove debug info
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 9a32ffb6a..58a6409b8 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -31,10 +31,10 @@ 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 status | ||
35 | git merge --no-ff --commit --no-edit source/develop | 34 | git merge --no-ff --commit --no-edit source/develop |
36 | git status | 35 | git submodule update --remote --force |
37 | git log | 36 | git add . |
37 | git commit -m "Update submodules" | ||
38 | fi | 38 | fi |
39 | install: | 39 | install: |
40 | - cd recipes && npm install && npm run package && cd .. | 40 | - cd recipes && npm install && npm run package && cd .. |