[igt-dev] [PATCH] .gitlab-ci: Reduce Docker images size

Arkadiusz Hiler arkadiusz.hiler at intel.com
Thu Mar 5 13:48:03 UTC 2020


On Thu, Mar 05, 2020 at 03:39:22PM +0200, Ramotowski, Maciej wrote:
> Yes I did use git send-email I did pre-check with --dry-run option it shows 8bit for encoding. Should I try to resend it?
> 
> -----Original Message-----
> From: Latvala, Petri 
> Sent: Thursday, March 5, 2020 1:11 PM
> To: Ramotowski, Maciej <maciej.ramotowski at intel.com>
> Cc: igt-dev at lists.freedesktop.org; Hiler, Arkadiusz <arkadiusz.hiler at intel.com>
> Subject: Re: [PATCH] .gitlab-ci: Reduce Docker images size
> 
> In your mail header:
> Content-Transfer-Encoding: base64
> 
> 
> That's why it doesn't apply in CI, and git am here too cannot cope with the encoding. Did you use git send-email to send the patch? If not, please do.

% wget https://patchwork.freedesktop.org/api/1.0/series/74003/revisions/2/mbox/ -O m.patch
--2020-03-05 15:42:17--  https://patchwork.freedesktop.org/api/1.0/series/74003/revisions/2/mbox/
Resolving patchwork.freedesktop.org (patchwork.freedesktop.org)... 131.252.210.167, 2610:10:20:722:a800:ff:feee:56cf
Connecting to patchwork.freedesktop.org (patchwork.freedesktop.org)|131.252.210.167|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 16478 (16K) [text/plain]
Saving to: ‘m.patch’

m.patch                                              100%[======================================================================================================================>]  16.09K  80.8KB/s    in 0.2s

2020-03-05 15:42:19 (80.8 KB/s) - ‘m.patch’ saved [16478/16478]

% git am m.patch
Applying: .gitlab-ci: Reduce Docker images size
error: patch failed: Dockerfile.build-debian:7
error: Dockerfile.build-debian: patch does not apply
error: patch failed: Dockerfile.build-debian-arm64:1
error: Dockerfile.build-debian-arm64: patch does not apply
error: patch failed: Dockerfile.build-debian-armhf:1
error: Dockerfile.build-debian-armhf: patch does not apply
error: patch failed: Dockerfile.build-debian-minimal:1
error: Dockerfile.build-debian-minimal: patch does not apply
error: patch failed: Dockerfile.build-debian-mips:2
error: Dockerfile.build-debian-mips: patch does not apply
error: patch failed: Dockerfile.build-fedora:1
error: Dockerfile.build-fedora: patch does not apply
Patch failed at 0001 .gitlab-ci: Reduce Docker images size
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

So it's not base64. Let me see what actually goes wrong. You can get the
unencoded patch here: https://patchwork.freedesktop.org/patch/356524/raw/



More information about the igt-dev mailing list