diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8523ea8961ed78456443c8daa27f936d71a8b9cb..e8948f2680fa27a918b38bd4ce46db57f6ddd846 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 3448b44658ea84e7a89c59a06e0d0d687539f002..ecdcf084e6d938e9657bc072f5c5b95a03b89cfd 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