diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-10-16 11:04:06 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-16 11:04:06 +0100 |
commit | a351a8d9f384979dc3acc462bb97a72e87e104d1 (patch) | |
tree | 033992eda62570275384871f07e1a399152a1a50 /.travis.yml | |
parent | Skip ci on linter commit [skip ci] (diff) | |
download | ferdium-app-a351a8d9f384979dc3acc462bb97a72e87e104d1.tar.gz ferdium-app-a351a8d9f384979dc3acc462bb97a72e87e104d1.tar.zst ferdium-app-a351a8d9f384979dc3acc462bb97a72e87e104d1.zip |
Fix wrongly merged edits [skip ci]
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a222ddf87..501c3480c 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -58,11 +58,7 @@ script: | |||
58 | - | | 58 | - | |
59 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 59 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
60 | git add . | 60 | git add . |
61 | <<<<<<< Updated upstream | ||
62 | git commit -m "Apply linter fixes" | ||
63 | ======= | ||
64 | git commit -m "Apply linter fixes [skip ci]" | 61 | git commit -m "Apply linter fixes [skip ci]" |
65 | >>>>>>> Stashed changes | ||
66 | 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]" |
67 | echo "Building..." | 63 | echo "Building..." |
68 | 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 |