diff --git a/build/ci/.code-quality-ci.yml b/build/ci/.code-quality-ci.yml index e98a44c89d0b792ca7e6eb00dec62b7267458c95..ab2aa8d7b3f5a988e5827b08c82c5a32459bdd94 100644 --- a/build/ci/.code-quality-ci.yml +++ b/build/ci/.code-quality-ci.yml @@ -3,7 +3,7 @@ code-quality-master: stage: test rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH - - if: $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH script: # writes golangci-lint output to gl-code-quality-report.json - golangci-lint run --config build/ci/.golangci-config/.golangci-master.yml --out-format code-climate | tee gl-code-quality-report.json @@ -19,7 +19,7 @@ code-quality: stage: test allow_failure: true rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH script: # writes golangci-lint output to gl-code-quality-report.json - golangci-lint run --config build/ci/.golangci-config/.golangci.yml --out-format code-climate | tee gl-code-quality-report.json