diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-13 21:56:32 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-12 16:27:02 +0100 |
| commit | 647c54da2779e5234547845ae13d8fafa478d3f3 (patch) | |
| tree | 5c9a90ff80bbc82f9b50f0a768c24a9b4b4ab653 /.gitlab-ci.yml | |
| parent | 6eeff67c6e03233d4480a55d05d4e0f1a88aef4c (diff) | |
| download | gitlab-ce-647c54da2779e5234547845ae13d8fafa478d3f3.tar.gz | |
Only run builds on master of CE or EE
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34348247e91..e1034032d6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,8 @@ update-knapsack: - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json - rm -f knapsack/*_node_*.json only: - - master - + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee # Execute all testing suites .use-db: &use-db @@ -143,7 +143,8 @@ spinach 9 10: *spinach-knapsack image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1" <<: *use-db only: - - master + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee cache: key: "ruby21" paths: @@ -286,7 +287,8 @@ bundler:audit: stage: test <<: *ruby-static-analysis only: - - master + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee script: - "bundle exec bundle-audit check --update --ignore OSVDB-115941" |