Commit 647c54da authored by Z.J. van de Weg's avatar Z.J. van de Weg Committed by Z.J. van de Weg

Only run builds on master of CE or EE

parent 6eeff67c
...@@ -61,8 +61,8 @@ update-knapsack: ...@@ -61,8 +61,8 @@ update-knapsack:
- scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
- rm -f knapsack/*_node_*.json - rm -f knapsack/*_node_*.json
only: only:
- master - master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
# Execute all testing suites # Execute all testing suites
.use-db: &use-db .use-db: &use-db
...@@ -143,7 +143,8 @@ spinach 9 10: *spinach-knapsack ...@@ -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" image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1"
<<: *use-db <<: *use-db
only: only:
- master - master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
cache: cache:
key: "ruby21" key: "ruby21"
paths: paths:
...@@ -286,7 +287,8 @@ bundler:audit: ...@@ -286,7 +287,8 @@ bundler:audit:
stage: test stage: test
<<: *ruby-static-analysis <<: *ruby-static-analysis
only: only:
- master - master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
script: script:
- "bundle exec bundle-audit check --update --ignore OSVDB-115941" - "bundle exec bundle-audit check --update --ignore OSVDB-115941"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment