From 6d88ccbc9fca19c437bc9e59a88a292994fdbf60 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 7 Dec 2023 10:42:43 +0000
Subject: [PATCH] Update CI Pipeline and sonar-project to new url.
---
.gitlab-ci.yml | 10 +++++-----
sonar-project.properties | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8523ea896..e8948f268 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -430,7 +430,7 @@ trigger-hpc-regression-tests:
- linux
rules:
- - if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop"'
+ - if: '$CI_PROJECT_NAMESPACE == "irmb"'
when: always
- if: '$CI_PROJECT_NAMESPACE != "irmb"'
when: manual
@@ -624,13 +624,14 @@ sanitizer-memory:
## Deploy ##
###############################################################################
# doxgen
+# This job only runs on the main branch of the parent repository, not on forks!
pages:
stage: deploy
image: alpine
only:
- - develop@irmb/VirtualFluids_dev
+ - main@irmb/VirtualFluids
needs: []
@@ -648,7 +649,7 @@ pages:
# sonar-scanner runs sonar-project.properties
# the reports in this file need to match the artifacts.
-# This job only runs on the development branch of the parent repository, not on forks!
+# This job only runs on the main branch of the parent repository, not on forks!
sonar-scanner:
stage: deploy
@@ -656,8 +657,7 @@ sonar-scanner:
- linux
only:
- #- develop
- - develop@irmb/VirtualFluids_dev
+ - main@irmb/VirtualFluids
variables:
SONAR_HOST_URL: "http://gitlab-runner01.irmb.bau.tu-bs.de/sonarqube/"
diff --git a/sonar-project.properties b/sonar-project.properties
index 3448b4465..ecdcf084e 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,7 +1,7 @@
# must be unique in a given SonarQube instance
-sonar.projectKey=vf:project:develop
+sonar.projectKey=vf:project:main
-sonar.projectName=VirtualFluids_dev
+sonar.projectName=VirtualFluids
sonar.projectVersion=0.1
--
GitLab