From f71b3175891999d2c6909437776474849936f45a Mon Sep 17 00:00:00 2001 From: Songtronix Date: Sat, 23 May 2020 10:02:39 +0200 Subject: [PATCH] change(ci): adjust docs + fix release template --- .gitlab/CI/build-post.gitlab-ci.yml | 1 - .gitlab/CI/publish.gitlab-ci.yml | 2 ++ .gitlab/CI/release.yml | 2 +- .gitlab/issue_templates/Bug.md | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab/CI/build-post.gitlab-ci.yml b/.gitlab/CI/build-post.gitlab-ci.yml index eae36a0662..96525669c9 100644 --- a/.gitlab/CI/build-post.gitlab-ci.yml +++ b/.gitlab/CI/build-post.gitlab-ci.yml @@ -1,4 +1,3 @@ -# Template to only run if actual changes has been made to the code and not just documentation .tests: &tests extends: .recompile stage: build-post diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml index bc3e1cd111..e170bfa7cd 100644 --- a/.gitlab/CI/publish.gitlab-ci.yml +++ b/.gitlab/CI/publish.gitlab-ci.yml @@ -1,3 +1,5 @@ +# Publishes veloren-server-cli to the gitlab container registry +# https://gitlab.com/veloren/veloren/container_registry docker: stage: publish extends: .release diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml index 3cacca7c5a..e1f61a850c 100644 --- a/.gitlab/CI/release.yml +++ b/.gitlab/CI/release.yml @@ -1,4 +1,4 @@ # Template to only run if pushes to master or a tag happened .release: rules: - - if: $CI_COMMIT_REF_NAME =~ /^master.$/ || $CI_COMMIT_TAG =~ /^r[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+/ + - if: $CI_COMMIT_REF_NAME =~ /^master.$/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+/ diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index f68fddc822..a4906f02be 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -38,4 +38,4 @@ logs, and code as it's tough to read otherwise.) (What version the bug happened e.g. Nightly, Stable 0.X.0, master) -/label ~ status::needs investigation ~type::bug \ No newline at end of file +/label ~ status::needs investigation ~type::bug