diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e7778fa875fa40cce03dba933593b2cb5be3bdf..077bfcde8b1eb177d0f26373b07039953a13c707 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 35c0f41b3341e7a071a27b8754bb45780386fa7d..3ef28e74fdc039671e570269ff80db336db653c4 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 988de9735cae6adb7ddbfcfa8e9f1aab9ab273f7..03a3d6691231a2e0f98254ef1b81e7cea9c2ccac 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 98c4238045f67cf871b461245c5ee9184de6872b..bc2a24a09277a9b424b1b84bba61969737750e4b 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"