diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-11 23:15:41 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-15 02:06:48 +0800 |
| commit | 6be736a7d24ca548778b1d6ff27fd9dcd3e4a7fa (patch) | |
| tree | bf77649f1e8a9e883bd7e3ecec30cde30eee9292 | |
| parent | 4f18de7087e4bf4ea51c8571be752cabd0a6e683 (diff) | |
| download | gitlab-ce-6be736a7d24ca548778b1d6ff27fd9dcd3e4a7fa.tar.gz | |
Enable ee_compat_check for forks, but not EE
We exclude known EE projects, and check the project directory
name for EE forks.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/dev.rake | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0520f3b1c37..895ab4c42b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -413,12 +413,12 @@ downtime_check: ee_compat_check: <<: *rake-exec - only: - - branches@gitlab-org/gitlab-ce except: - master - tags - /^[\d-]+-stable(-ee)?/ + - branches@gitlab-org/gitlab-ee + - branches@gitlab/gitlab-ee allow_failure: yes cache: key: "ee_compat_check_repo" diff --git a/lib/tasks/gitlab/dev.rake b/lib/tasks/gitlab/dev.rake index 7ccda04a35f..3eade7bf553 100644 --- a/lib/tasks/gitlab/dev.rake +++ b/lib/tasks/gitlab/dev.rake @@ -13,7 +13,10 @@ namespace :gitlab do args end - if Gitlab::EeCompatCheck.new(opts || {}).check + if File.basename(Rails.root) == 'gitlab-ee' + puts "Skipping EE projects" + exit 0 + elsif Gitlab::EeCompatCheck.new(opts || {}).check exit 0 else exit 1 |