diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-14 16:16:10 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-12 16:27:59 +0100 |
| commit | 40062fdc02fe2d0ee5ac9c9462f8692814e69d6e (patch) | |
| tree | 0979708ce137ff8b8097eb6342922b05ff4afc7e /.gitlab-ci.yml | |
| parent | 647c54da2779e5234547845ae13d8fafa478d3f3 (diff) | |
| download | gitlab-ce-40062fdc02fe2d0ee5ac9c9462f8692814e69d6e.tar.gz | |
Also test on dev.gitlab [ci skip]zj-update-ci
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1034032d6d..84f1f115b3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,8 @@ update-knapsack: only: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee -# Execute all testing suites + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee .use-db: &use-db services: @@ -145,6 +146,8 @@ spinach 9 10: *spinach-knapsack only: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee cache: key: "ruby21" paths: @@ -289,6 +292,8 @@ bundler:audit: only: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee script: - "bundle exec bundle-audit check --update --ignore OSVDB-115941" @@ -299,6 +304,9 @@ migration paths: SETUP_DB: "false" only: - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee script: - git checkout HEAD . - git fetch --tags |