summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2024-04-17 20:59:01 +0200
committerFedja Beader <fedja@protonmail.ch>2024-04-17 21:00:02 +0200
commitc755679f5e79eae96f856c935554252b1a9bb6f7 (patch)
tree95c8b0cd4968b456071d21d595c30f731f4993d2
parentf091b0e42822238ddf45589913b1692b0a99b0f7 (diff)
downloadclassic-serverdata-c755679f5e79eae96f856c935554252b1a9bb6f7.tar.gz
classic-serverdata-c755679f5e79eae96f856c935554252b1a9bb6f7.tar.bz2
classic-serverdata-c755679f5e79eae96f856c935554252b1a9bb6f7.tar.xz
classic-serverdata-c755679f5e79eae96f856c935554252b1a9bb6f7.zip
Skip commit if there is nothing to do. Otherwise git commit errors outHEADmaster
the job
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbf1c315..93bfdaf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,13 +22,13 @@ legacy:
- ./evolved.py
- cd ..
- git status
+ - (git status --porcelain | grep '.*') || exit 0 # skip if nothing to commit
- git config user.email "numa@themanaworld.org"
- git config user.name "Numa"
- git commit -a -m "Regenerate databases" --author="Numa <numa@themanaworld.org>"
- git push # may cause a CI loop >.<
only:
- master
- allow_failure: true
evolved:
stage: deploy
@@ -45,13 +45,13 @@ evolved:
- cp -v ../world/map/db/mob_db.conf db/pre-re/
- cp -v ../world/map/db/item_db.conf db/pre-re/
- git status
+ - (git status --porcelain | grep '.*') || exit 0 # skip if nothing to commit
- git config user.email "numa@themanaworld.org"
- git config user.name "Numa"
- git commit -a -m "Sync with Legacy repo" --author="Numa <numa@themanaworld.org>"
- git push
only:
- master
- allow_failure: true
pages:
stage: deploy