Rémy Coutable
4282e610f7
Generate patch with git diff instead of git format-patch
...
This will generate a patch:
- that is smaller
- that applies more cleanly since only the final diff will be applied
instead of each commit's diff
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:50:53 +02:00
Robert Speicher
611c2fb0bc
Fix invalid object reference in ee_compat_check script
2017-05-17 15:17:02 -04:00
Rémy Coutable
992dfd7eb4
Fetch CE/branch before running git apply --check --3way patch
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-16 15:52:32 +02:00
Luke "Jared" Bennett
b3da5e15bd
Update ee_compat_check.rb to include git apply --reject suggestion
2017-05-16 13:04:52 +00:00
Rémy Coutable
1dbd80d190
Fix Gitlab::EeCompatCheck: use ee_branch_found instead of ee_branch
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-28 09:26:47 +02:00
Rémy Coutable
98b87a6ebf
Put banners in constants
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-23 23:30:27 +01:00
Rémy Coutable
8720f1d634
Fetch deeper the tested branch before fetching master
...
The tested branch is clone with a deep of 20 so if it has more than 20
commits, we need to deepen its hitory to be able to find the merge-base
with origin/master.
Also, detect prefixed EE branch as well, i.e. `ee-<branch>`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-23 23:30:27 +01:00
Rémy Coutable
23e43ec5b1
Improve Gitlab::EeCompatCheck by using the git apply --3way flag
...
This should solve 99% of the false-positive of the `ee_compat_check` job.
2017-02-22 16:00:49 +00:00
Rémy Coutable
cd78e02096
Ensure we sanitize branch names with path-unfriendly characters
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-23 10:55:28 +01:00
Rémy Coutable
88edbd11a9
Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_check task
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-10 10:40:47 +01:00
Rémy Coutable
d38d4a9e8e
Disable Rails/Output cop since it makes no sense here
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-24 21:19:46 +02:00
Rémy Coutable
402dcab4f1
Use File.write instead of File.open + File#write
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-24 20:47:50 +02:00
Rémy Coutable
c7af4cf830
Don't print out implementation detail step
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-24 20:29:00 +02:00
Rémy Coutable
af669cbea3
Change the approach to check if patches apply cleanly
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-21 19:16:56 +02:00
