diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2020-10-03 01:09:40 +0100 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-03 01:09:40 +0100 |
| commit | ddf3a33dbd62a73317810f9d6330ac767b43d889 (patch) | |
| tree | 165e31742c80475837180aa2bd3e6fb95c7f9f1a /.travis.yml | |
| parent | 5.6.0-nightly.3 and trigger AppVeyor nightly build [skip travisci] (diff) | |
| download | ferdium-app-ddf3a33dbd62a73317810f9d6330ac767b43d889.tar.gz ferdium-app-ddf3a33dbd62a73317810f9d6330ac767b43d889.tar.zst ferdium-app-ddf3a33dbd62a73317810f9d6330ac767b43d889.zip | |
Retry merge step
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 192161387..9a32ffb6a 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -28,10 +28,13 @@ cache: npm | |||
| 28 | before_install: | 28 | before_install: |
| 29 | - git submodule update --init --recursive | 29 | - git submodule update --init --recursive |
| 30 | - | | 30 | - | |
| 31 | if [ $TRAVIS_BRANCH == "nightly"]; then | 31 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
| 32 | git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* | 32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
| 33 | git fetch | 33 | git fetch source |
| 34 | git merge --no-ff --commit --no-edit origin/develop | 34 | git status |
| 35 | git merge --no-ff --commit --no-edit source/develop | ||
| 36 | git status | ||
| 37 | git log | ||
| 35 | fi | 38 | fi |
| 36 | install: | 39 | install: |
| 37 | - cd recipes && npm install && npm run package && cd .. | 40 | - cd recipes && npm install && npm run package && cd .. |