diff options
| author | Thomas White <taw@physics.org> | 2024-06-14 14:57:56 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2024-06-14 14:57:56 +0200 |
| commit | 535cdec37dcd94606ab5992e73c5ebd437ddfd99 (patch) | |
| tree | 57b6310f372fe806ecb621c5fff6e48270757d7d | |
| parent | c87b69311f983b7b1b17565dff67f54d21343e36 (diff) | |
CI: Run build-centos7 and build-brew-macos on master branch only
The Mac runner and Seedee source aren't available elsewhere, so these
will always fail for merge requests.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
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: |