Commit 17e79998 authored by Robert Speicher's avatar Robert Speicher

Merge branch '32085-improve-ee-compat-check' into 'master'

Fetch CE/branch before running `git apply --check --3way patch`

Closes #32085

See merge request !11412
parents fb67ea49 992dfd7e
...@@ -131,10 +131,12 @@ module Gitlab ...@@ -131,10 +131,12 @@ module Gitlab
def check_patch(patch_path) def check_patch(patch_path)
step("Checking out master", %w[git checkout master]) step("Checking out master", %w[git checkout master])
step("Resetting to latest master", %w[git reset --hard origin/master]) step("Resetting to latest master", %w[git reset --hard origin/master])
step("Fetching CE/#{branch}", %W[git fetch #{CE_REPO} #{branch}])
step( step(
"Checking if #{patch_path} applies cleanly to EE/master", "Checking if #{patch_path} applies cleanly to EE/master",
%W[git apply --check --3way #{patch_path}] %W[git apply --check --3way #{patch_path}]
) do |output, status| ) do |output, status|
puts output
unless status.zero? unless status.zero?
@failed_files = output.lines.reduce([]) do |memo, line| @failed_files = output.lines.reduce([]) do |memo, line|
if line.start_with?('error: patch failed:') if line.start_with?('error: patch failed:')
......
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