From d389d14192e1e483fbd48fa9b5c5bee25db14a20 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 14 May 2023 12:11:42 +0930 Subject: [PATCH] fix: validation jobs on all except merge !21 --- conventional_commits/.gitlab-ci.yml | 18 +++++++++++------- yaml_lint/.gitlab-ci.yml | 7 ++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/conventional_commits/.gitlab-ci.yml b/conventional_commits/.gitlab-ci.yml index b0df25d..183d94e 100644 --- a/conventional_commits/.gitlab-ci.yml +++ b/conventional_commits/.gitlab-ci.yml @@ -44,13 +44,17 @@ junit: - "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/*.junit.xml" rules: - - if: '$JOB_STOP_CONVENTIONAL_COMMITS' - when: never - - if: '$CI_COMMIT_BRANCH == "master"' - when: never - - if: '$CI_COMMIT_BRANCH' - when: always - - when: never + - if: '$JOB_STOP_CONVENTIONAL_COMMITS' + when: never + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: '$CI_COMMIT_TAG' + when: always + - if: '$CI_COMMIT_BRANCH == "master"' + when: always + - if: '$CI_COMMIT_BRANCH' + when: always + - when: never MR Title: diff --git a/yaml_lint/.gitlab-ci.yml b/yaml_lint/.gitlab-ci.yml index 0dedb4e..812a3c3 100644 --- a/yaml_lint/.gitlab-ci.yml +++ b/yaml_lint/.gitlab-ci.yml @@ -36,7 +36,12 @@ junit: - "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/*.junit.xml" rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: '$CI_COMMIT_TAG' + when: always + - if: '$CI_COMMIT_BRANCH == "master"' + when: always - if: '$CI_COMMIT_BRANCH' when: always - when: never -