Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
647c54da
Commit
647c54da
authored
8 years ago
by
Z.J. van de Weg
Committed by
Z.J. van de Weg
8 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Only run builds on master of CE or EE
parent
6eeff67c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
.gitlab-ci.yml
.gitlab-ci.yml
+6
-4
No files found.
.gitlab-ci.yml
View file @
647c54da
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment