include gittag into yaml

.gitlab/CI/publish.gitlab-ci.yml

@@ -32,6 +32,8 @@ docker:
 
 gittag:
   extends: .publish
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule"
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
   tags: ["veloren/veloren", "publish", "trusted"]
   script:
@@ -40,10 +42,9 @@ gittag:
     - git config --global http.postBuffer 52428800
     - git remote set-url origin https://veloren-bot:${GITLAB_TOKEN_WRITE}@${CI_PROJECT_URL:8}
     - |
-      publishgittag PUBLISH_GIT_TAG
+      if [[ ! "${SCHEDULE_CADENCE}" =~ ${TAG_REGEX} ]]; then
-      if [ "${PUBLISH_GIT_TAG}" != "" ]; then
+        git tag -a "${SCHEDULE_CADENCE}" -m '' -f;
-        git tag -a "${PUBLISH_GIT_TAG}" -m '' -f;
+        git push origin "${SCHEDULE_CADENCE}" -f;
-        git push origin "${PUBLISH_GIT_TAG}" -f;
       fi
 
 pages:

.gitlab/scripts/util.sh

@@ -27,23 +27,3 @@ if [[ ${CI_COMMIT_BRANCH} == ${CI_DEFAULT_BRANCH} ]]; then
   return 0;
 fi
 }
-
-### returns respective GIT TAG
-### release-tag => "" (releases already have a tag)
-### schedule => <SCHEDULE_CADENCE> (e.g. nightly)
-### master => "" (master doesn't need a tag)
-### else => ""
-publishgittag () {
-local -n VAR=$1
-if [[ -z "${SCHEDULE_CADENCE}" && ${CI_PIPELINE_SOURCE} == "schedule" ]]; then
-  VAR="${SCHEDULE_CADENCE}";
-  # sanitize check
-  if [[ "${SCHEDULE_CADENCE}" =~ ${TAG_REGEX} ]]; then
-    VAR="invalid_cadence";
-  else
-    VAR="${SCHEDULE_CADENCE}";
-  fi
-  return 0;
-fi
-VAR="";
-}