Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f9f33323
Commit
f9f33323
authored
Jul 19, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Developer can just download the patch from the `ee_compat_check` job's artifact
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
f45b96a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+7
-6
No files found.
lib/gitlab/ee_compat_check.rb
View file @
f9f33323
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment