Merge branch 'improve-ee-compat-check' into 'master'
Developer can just download the patch from the `ee_compat_check` job's artifact See merge request !12967
This commit is contained in:
commit
d0da585233
|
@ -237,6 +237,10 @@ module Gitlab
|
|||
branch_name.parameterize << '.patch'
|
||||
end
|
||||
|
||||
def patch_url
|
||||
"https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/#{ENV['CI_JOB_ID']}/artifacts/raw/ee_compat_check/patches/#{ce_patch_name}"
|
||||
end
|
||||
|
||||
def step(desc, cmd = nil)
|
||||
puts "\n=> #{desc}\n"
|
||||
|
||||
|
@ -303,14 +307,11 @@ module Gitlab
|
|||
|
||||
2. Apply your branch's patch to EE
|
||||
|
||||
# In the CE repo
|
||||
$ git fetch origin master
|
||||
$ git diff --binary origin/master...HEAD -- > #{ce_branch}.patch
|
||||
|
||||
# In the EE repo
|
||||
$ git fetch origin master
|
||||
$ git checkout -b #{ee_branch_prefix} origin/master
|
||||
$ git apply --3way path/to/#{ce_branch}.patch
|
||||
$ wget #{patch_url}
|
||||
$ git apply --3way #{ce_patch_name}
|
||||
|
||||
At this point you might have conflicts such as:
|
||||
|
||||
|
@ -324,7 +325,7 @@ module Gitlab
|
|||
If the patch couldn't be applied cleanly, use the following command:
|
||||
|
||||
# In the EE repo
|
||||
$ git apply --reject path/to/#{ce_branch}.patch
|
||||
$ git apply --reject #{ce_patch_name}
|
||||
|
||||
This option makes git apply the parts of the patch that are applicable,
|
||||
and leave the rejected hunks in corresponding `.rej` files.
|
||||
|
|
Loading…
Reference in New Issue