From ef86b3987c603bd5e64d563b092b269bddc975f1 Mon Sep 17 00:00:00 2001 From: Malte Bauch <malte.bauch@stud.h-da.de> Date: Mon, 12 Oct 2020 13:16:11 +0200 Subject: [PATCH] fix code-quality rules --- build/ci/.code-quality-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/ci/.code-quality-ci.yml b/build/ci/.code-quality-ci.yml index a24ccd261..d2258d772 100644 --- a/build/ci/.code-quality-ci.yml +++ b/build/ci/.code-quality-ci.yml @@ -2,8 +2,8 @@ code-quality-master: image: golangci/golangci-lint:latest-alpine 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_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' + - if: '$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 -- GitLab