diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2020-10-02 20:06:18 +0100 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-02 20:06:18 +0100 |
| commit | 1d3706ee2c37ce47fcacaa0ac2f04797f7bf0d12 (patch) | |
| tree | 4bfd1e8de40fe84672e3b18aeacbba4c08f8bf0b /.travis.yml | |
| parent | 5.6.0-nightly.1 and trigger AppVeyor nightly build [skip travisci] (diff) | |
| download | ferdium-app-1d3706ee2c37ce47fcacaa0ac2f04797f7bf0d12.tar.gz ferdium-app-1d3706ee2c37ce47fcacaa0ac2f04797f7bf0d12.tar.zst ferdium-app-1d3706ee2c37ce47fcacaa0ac2f04797f7bf0d12.zip | |
Merge develop in the nightly branch before installing
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 6075d2d47..a62b086c8 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -27,6 +27,12 @@ cache: npm | |||
| 27 | 27 | ||
| 28 | before_install: | 28 | before_install: |
| 29 | - git submodule update --init --recursive | 29 | - git submodule update --init --recursive |
| 30 | - | | ||
| 31 | if [ $TRAVIS_BRANCH == "nightly"]; then | ||
| 32 | git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* | ||
| 33 | git fetch | ||
| 34 | git merge --no-ff origin/develop | ||
| 35 | fi | ||
| 30 | install: | 36 | install: |
| 31 | - cd recipes && npm install && npm run package && cd .. | 37 | - cd recipes && npm install && npm run package && cd .. |
| 32 | - travis_retry npx lerna bootstrap | 38 | - travis_retry npx lerna bootstrap |