diff options
author | 2021-05-04 14:44:36 +0530 | |
---|---|---|
committer | 2021-05-04 09:14:36 +0000 | |
commit | 00725cc7b4ed1515f7319c8d796d3cd7fe622a25 (patch) | |
tree | 3bec7dcf25a19de8b286480cdf5d51cab6cf347b | |
parent | Clean the build and out folders before running the build (#1342) (diff) | |
download | ferdium-app-00725cc7b4ed1515f7319c8d796d3cd7fe622a25.tar.gz ferdium-app-00725cc7b4ed1515f7319c8d796d3cd7fe622a25.tar.zst ferdium-app-00725cc7b4ed1515f7319c8d796d3cd7fe622a25.zip |
Removed redundant 'git' commands. (#1343)
-rw-r--r-- | .travis.yml | 8 | ||||
-rw-r--r-- | README.md | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 6602455ca..ca2532395 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -50,8 +50,7 @@ before_install: | |||
50 | else | 50 | else |
51 | echo "Found changes, proceeding with submodule updates" | 51 | echo "Found changes, proceeding with submodule updates" |
52 | git submodule update --remote --force | 52 | git submodule update --remote --force |
53 | git add . | 53 | git commit -am "Update submodules [skip ci]" || true |
54 | git commit -m "Update submodules [skip ci]" || true | ||
55 | fi | 54 | fi |
56 | echo "Completed merging from develop branch and upgrading submodules" | 55 | echo "Completed merging from develop branch and upgrading submodules" |
57 | fi | 56 | fi |
@@ -70,13 +69,12 @@ script: | |||
70 | fi | 69 | fi |
71 | - | | 70 | - | |
72 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 71 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
73 | git add . | 72 | git commit -am "Apply linter fixes [skip ci]" |
74 | git commit -m "Apply linter fixes [skip ci]" | ||
75 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" | 73 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
76 | echo "Building for nightly..." | 74 | echo "Building for nightly..." |
77 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 75 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |
78 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 76 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
79 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 77 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
80 | git push --quiet --set-upstream nightly HEAD:nightly >/dev/null 2>&1 | 78 | git push -qu nightly HEAD:nightly >/dev/null 2>&1 |
81 | fi | 79 | fi |
82 | fi | 80 | fi |
@@ -332,8 +332,7 @@ Create a new [draft release](https://github.com/getferdi/ferdi/releases/new) tha | |||
332 | $ git checkout develop && git pull | 332 | $ git checkout develop && git pull |
333 | $ git checkout release | 333 | $ git checkout release |
334 | $ git submodule update --remote --force | 334 | $ git submodule update --remote --force |
335 | $ git add . | 335 | $ git commit -am "Update submodules" |
336 | $ git commit -m "Update submodules" | ||
337 | $ git merge --no-ff develop | 336 | $ git merge --no-ff develop |
338 | $ git push | 337 | $ git push |
339 | ``` | 338 | ``` |