diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8091043c5a1a5fbeae8cc80cb188e9804725d40..1119f4eb90a39da2d0e1580e1377fc39f11ad0b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ build-for-staging: paths: - target/*.war rules: - - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"' build-for-production: stage: build @@ -104,7 +104,7 @@ test: tags: - java rules: - - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"' - if: $CI_COMMIT_REF_NAME == $RELEASE_BRANCH deploy-to-staging: @@ -142,7 +142,7 @@ deploy-to-staging: tags: - java rules: - - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"' environment: name: staging url: https://vipscore02test.nibio.no @@ -158,7 +158,7 @@ upload-snapshot: tags: - java rules: - - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"' deploy-to-production: stage: deploy diff --git a/pom.xml b/pom.xml index b713c40e334d6b7d759279b32a60671ce952aa44..a6bd9b1bdfb0aef7b5c5aae3a0c7dfeb03af3010 100755 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>no.nibio</groupId> <artifactId>VIPSCore</artifactId> <packaging>war</packaging> - <version>2.0.10</version> + <version>2.0.11-SNAPSHOT</version> <name>VIPSCore</name> <url>http://maven.apache.org</url>