diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-20 14:30:47 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-20 14:30:47 +0300 |
| commit | a09d032b2a64c7b6652dcd589de2d9bcba7d9613 (patch) | |
| tree | f182dd3d91f8817124925ad32c237da0c9ab8139 | |
| parent | 7cd2d52829a602606f0b0e9e41498a9bad6fae92 (diff) | |
| parent | 8281865092a4d2c25bd036d2feff6a8499c320b0 (diff) | |
Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'
Enable ee_compat_check for forks, but not EE
Closes #37713
See merge request gitlab-org/gitlab-ce!14189
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 7 | ||||
| -rw-r--r-- | lib/tasks/gitlab/dev.rake | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 375757086a6..f8f73e4d4d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -412,12 +412,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/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index abd401224d8..c5a8ea12245 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -284,13 +284,18 @@ module Gitlab EE/master, and no `#{ee_branch_prefix}` or `#{ee_branch_suffix}` branch was found in the EE repository. + If you're a community contributor, don't worry, someone from + GitLab Inc. will take care of this, and you don't have to do anything. + If you're willing to help, and are ok to contribute to EE as well, + you're welcome to help. You could follow the instructions below. + #{conflicting_files_msg} We advise you to create a `#{ee_branch_prefix}` or `#{ee_branch_suffix}` branch that includes changes from `#{ce_branch}` but also specific changes than can be applied cleanly to EE/master. In some cases, the conflicts are trivial and you can ignore the warning from this job. As always, - use your best judgment! + use your best judgement! There are different ways to create such branch: 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 |