From 7aea500ae29fbfa347e29c63f63d19021e55c6bc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 24 Jun 2020 13:56:20 +0200
Subject: [PATCH] [ci] Always run clang-* jobs manually.
---
.gitlab-ci.yml | 2 +-
scripts/ci/extends/{rules-master-manual.yml => rules.yml} | 5 +++++
scripts/ci/jobs/clang-sanitizer.yml | 2 +-
scripts/ci/jobs/clang-tidy.yml | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
rename scripts/ci/extends/{rules-master-manual.yml => rules.yml} (62%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e7778fa875..077bfcde8b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ include:
- template: 'Code-Quality.gitlab-ci.yml'
# extends
- local: '/scripts/ci/extends/defaults.yml'
- - local: '/scripts/ci/extends/rules-master-manual.yml'
+ - local: '/scripts/ci/extends/rules.yml'
- local: '/scripts/ci/extends/template-build-linux.yml'
- local: '/scripts/ci/extends/template-build-win.yml'
- local: '/scripts/ci/extends/container-maker-setup.yml'
diff --git a/scripts/ci/extends/rules-master-manual.yml b/scripts/ci/extends/rules.yml
similarity index 62%
rename from scripts/ci/extends/rules-master-manual.yml
rename to scripts/ci/extends/rules.yml
index 35c0f41b334..3ef28e74fdc 100644
--- a/scripts/ci/extends/rules-master-manual.yml
+++ b/scripts/ci/extends/rules.yml
@@ -3,3 +3,8 @@
- if: '$CI_COMMIT_BRANCH == "master"'
- when: manual
allow_failure: true
+
+.rules-manual:
+ rules:
+ - when: manual
+ allow_failure: true
diff --git a/scripts/ci/jobs/clang-sanitizer.yml b/scripts/ci/jobs/clang-sanitizer.yml
index 988de9735ca..03a3d669123 100644
--- a/scripts/ci/jobs/clang-sanitizer.yml
+++ b/scripts/ci/jobs/clang-sanitizer.yml
@@ -4,7 +4,7 @@ clang sanitizer:
- docker
extends:
- .defaults
- - .rules-master-manual
+ - .rules-manual
variables:
BUILD_DIR: "build-sanitizer"
diff --git a/scripts/ci/jobs/clang-tidy.yml b/scripts/ci/jobs/clang-tidy.yml
index 98c4238045f..bc2a24a0927 100644
--- a/scripts/ci/jobs/clang-tidy.yml
+++ b/scripts/ci/jobs/clang-tidy.yml
@@ -4,7 +4,7 @@ clang tidy:
- docker
extends:
- .defaults
- - .rules-master-manual
+ - .rules-manual
variables:
BUILD_DIR: "build-tidy"
--
GitLab