Commit a09d032b authored by Rémy Coutable's avatar Rémy Coutable

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
parents 7cd2d528 82818650
...@@ -412,12 +412,12 @@ downtime_check: ...@@ -412,12 +412,12 @@ downtime_check:
ee_compat_check: ee_compat_check:
<<: *rake-exec <<: *rake-exec
only:
- branches@gitlab-org/gitlab-ce
except: except:
- master - master
- tags - tags
- /^[\d-]+-stable(-ee)?/ - /^[\d-]+-stable(-ee)?/
- branches@gitlab-org/gitlab-ee
- branches@gitlab/gitlab-ee
allow_failure: yes allow_failure: yes
cache: cache:
key: "ee_compat_check_repo" key: "ee_compat_check_repo"
......
...@@ -284,13 +284,18 @@ module Gitlab ...@@ -284,13 +284,18 @@ module Gitlab
EE/master, and no `#{ee_branch_prefix}` or `#{ee_branch_suffix}` branch EE/master, and no `#{ee_branch_prefix}` or `#{ee_branch_suffix}` branch
was found in the EE repository. 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} #{conflicting_files_msg}
We advise you to create a `#{ee_branch_prefix}` or `#{ee_branch_suffix}` We advise you to create a `#{ee_branch_prefix}` or `#{ee_branch_suffix}`
branch that includes changes from `#{ce_branch}` but also specific changes branch that includes changes from `#{ce_branch}` but also specific changes
than can be applied cleanly to EE/master. In some cases, the conflicts 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, 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: There are different ways to create such branch:
......
...@@ -13,7 +13,10 @@ namespace :gitlab do ...@@ -13,7 +13,10 @@ namespace :gitlab do
args args
end 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 exit 0
else else
exit 1 exit 1
......
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