aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e798202..92a33525 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,6 +101,8 @@ build-brew-macos:
- brew install -v -s ./crystfel.rb --HEAD
- brew test crystfel
- brew uninstall -v -f crystfel
+ rules:
+ - if: $CI_COMMIT_BRANCH == "master"
build-centos7:
image: gitlab.desy.de:5555/thomas.white/crystfel/centos7/dev_env
@@ -124,7 +126,7 @@ build-centos7:
reports:
junit: temp/crystfel/build/meson-logs/testlog.junit.xml
rules:
- - if: $CI_PIPELINE_SOURCE != 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == "master"
build-deploy-local-maxwell:
tags: