diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-10-16 01:13:23 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-16 01:13:23 +0100 |
commit | 046750be465de463c07b3d0b98202502345a5fd2 (patch) | |
tree | 145d04b0d24fe1712f09cf6fb233c9178330111c | |
parent | 5.6.0-nightly.9 and trigger AppVeyor nightly build [skip travisci] (diff) | |
download | ferdium-app-046750be465de463c07b3d0b98202502345a5fd2.tar.gz ferdium-app-046750be465de463c07b3d0b98202502345a5fd2.tar.zst ferdium-app-046750be465de463c07b3d0b98202502345a5fd2.zip |
Skip ci on linter commit [skip ci]
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 5cb1c88db..a222ddf87 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -58,7 +58,11 @@ script: | |||
58 | - | | 58 | - | |
59 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 59 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
60 | git add . | 60 | git add . |
61 | <<<<<<< Updated upstream | ||
61 | git commit -m "Apply linter fixes" | 62 | git commit -m "Apply linter fixes" |
63 | ======= | ||
64 | git commit -m "Apply linter fixes [skip ci]" | ||
65 | >>>>>>> Stashed changes | ||
62 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" | 66 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
63 | echo "Building..." | 67 | echo "Building..." |
64 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 68 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |