From 1a4d020df0c5de880c99eacb1e0476bab27e84e6 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 16 Jul 2020 14:18:10 +0200
Subject: [PATCH] [ci] Disabled regular code quality job in favor of cppcheck.
Currently there can just be one code quality report, see
https://gitlab.com/gitlab-org/gitlab/-/issues/9014
Workaround could be
https://gitlab.com/gitlab-org/gitlab/-/issues/9014#note_374129632
For now favoring cppcheck report.
---
.gitlab-ci.yml | 2 +-
scripts/ci/jobs/code-quality.yml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e72b91190af..e9646947359 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ include:
- local: '/scripts/ci/jobs/build-win.yml'
- local: '/scripts/ci/jobs/build-mac.yml'
- local: '/scripts/ci/jobs/checks.yml'
- - template: 'Code-Quality.gitlab-ci.yml'
+ # - template: 'Code-Quality.gitlab-ci.yml' # see !3053
- local: '/scripts/ci/jobs/code-quality.yml'
- local: '/scripts/ci/jobs/build-gui-linux.yml'
- local: '/scripts/ci/jobs/build-gui-win.yml'
diff --git a/scripts/ci/jobs/code-quality.yml b/scripts/ci/jobs/code-quality.yml
index 281dd53103c..1c663903adf 100644
--- a/scripts/ci/jobs/code-quality.yml
+++ b/scripts/ci/jobs/code-quality.yml
@@ -14,7 +14,8 @@ cppcheck:
codequality: build/cppcheck.json
expire_in: 1 week
-code_quality:
+# Disabled, see !3053
+.code_quality:
stage: check
tags: [docker, envinf1]
needs: []
--
GitLab