From 52d8aa5ac9a29ccbee203e9799a2571fb3836e6a Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Sat, 14 Dec 2024 11:32:46 +0100 Subject: [PATCH] [ci] feat: improve readibility on gitlab run rules --- .gitlab/deployment.yaml | 4 +++- .gitlab/linting.yaml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab/deployment.yaml b/.gitlab/deployment.yaml index 06fd369..ced0362 100644 --- a/.gitlab/deployment.yaml +++ b/.gitlab/deployment.yaml @@ -7,7 +7,9 @@ deployment: name: "cr.simoncor.net/siempie/ansible-deployment:latest" entrypoint: ["/bin/sh", "-c"] rules: - - if: '$CI_PIPELINE_SOURCE != "schedule" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - when: "never" diff --git a/.gitlab/linting.yaml b/.gitlab/linting.yaml index d2efbab..759cbee 100644 --- a/.gitlab/linting.yaml +++ b/.gitlab/linting.yaml @@ -7,7 +7,8 @@ linting: name: "cr.simoncor.net/siempie/ansible-deployment:latest" entrypoint: ["/bin/sh", "-c"] rules: - - if: '$CI_PIPELINE_SOURCE != "schedule" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - when: "never" # start linting