Skip to content
Snippets Groups Projects
Commit eeb9af28 authored by Sören Peters's avatar Sören Peters
Browse files

Merge branch 'develop' into 'develop'

Update CI Pipeline and sonar-project to new url.

See merge request !370
parents d4af4ac9 6d88ccbc
No related branches found
No related tags found
2 merge requests!371Release 0.1,!370Update CI Pipeline and sonar-project to new url.
...@@ -430,7 +430,7 @@ trigger-hpc-regression-tests: ...@@ -430,7 +430,7 @@ trigger-hpc-regression-tests:
- linux - linux
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop"' - if: '$CI_PROJECT_NAMESPACE == "irmb"'
when: always when: always
- if: '$CI_PROJECT_NAMESPACE != "irmb"' - if: '$CI_PROJECT_NAMESPACE != "irmb"'
when: manual when: manual
...@@ -624,13 +624,14 @@ sanitizer-memory: ...@@ -624,13 +624,14 @@ sanitizer-memory:
## Deploy ## ## Deploy ##
############################################################################### ###############################################################################
# doxgen # doxgen
# This job only runs on the main branch of the parent repository, not on forks!
pages: pages:
stage: deploy stage: deploy
image: alpine image: alpine
only: only:
- develop@irmb/VirtualFluids_dev - main@irmb/VirtualFluids
needs: [] needs: []
...@@ -648,7 +649,7 @@ pages: ...@@ -648,7 +649,7 @@ pages:
# sonar-scanner runs sonar-project.properties # sonar-scanner runs sonar-project.properties
# the reports in this file need to match the artifacts. # 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: sonar-scanner:
stage: deploy stage: deploy
...@@ -656,8 +657,7 @@ sonar-scanner: ...@@ -656,8 +657,7 @@ sonar-scanner:
- linux - linux
only: only:
#- develop - main@irmb/VirtualFluids
- develop@irmb/VirtualFluids_dev
variables: variables:
SONAR_HOST_URL: "http://gitlab-runner01.irmb.bau.tu-bs.de/sonarqube/" SONAR_HOST_URL: "http://gitlab-runner01.irmb.bau.tu-bs.de/sonarqube/"
......
# must be unique in a given SonarQube instance # 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 sonar.projectVersion=0.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment