From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Willian Rampazzo" <willianr@redhat.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: Re: [PATCH] gitlab: Escape git-describe match pattern on Windows hosts
Date: Wed, 1 Sep 2021 18:24:52 +0200 [thread overview]
Message-ID: <33d1a40b-c242-6472-5aa4-4108668ccc84@redhat.com> (raw)
In-Reply-To: <YS+iCgl88cmMepKl@redhat.com>
On 9/1/21 5:53 PM, Daniel P. Berrangé wrote:
> On Wed, Sep 01, 2021 at 05:35:42PM +0200, Philippe Mathieu-Daudé wrote:
>> On 9/1/21 5:21 PM, Daniel P. Berrangé wrote:
>>> On Wed, Sep 01, 2021 at 04:17:48PM +0100, Peter Maydell wrote:
>>>> On Wed, 1 Sept 2021 at 15:59, Daniel P. Berrangé <berrange@redhat.com> wrote:
>>>>>
>>>>> On Wed, Sep 01, 2021 at 04:52:29PM +0200, Philippe Mathieu-Daudé wrote:
>>>>>> Properly escape git-describe 'match' pattern to avoid (MinGW):
>>>>>>
>>>>>> $ if grep -q "EXESUF=.exe" config-host.mak; then make installer;
>>>>>> version="$(git describe --match v[0-9]*)";
>>>>>> mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi
>>>>>> fatal: No names found, cannot describe anything.
>>>>>> ERROR: Job failed: exit code 1
>>>>>>
>>>>>> Reported-by: Cédric Le Goater <clg@kaod.org>
>>>>>> Fixes: 8619b5ddb56 ("ci: build & store windows installer")
>>>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/591
>>>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>>>> ---
>>>>>> .gitlab-ci.d/crossbuild-template.yml | 2 +-
>>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml
>>>>>> index 10d22dcf6c1..62d33e6661d 100644
>>>>>> --- a/.gitlab-ci.d/crossbuild-template.yml
>>>>>> +++ b/.gitlab-ci.d/crossbuild-template.yml
>>>>>> @@ -14,7 +14,7 @@
>>>>>> - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
>>>>>> - if grep -q "EXESUF=.exe" config-host.mak;
>>>>>> then make installer;
>>>>>> - version="$(git describe --match v[0-9]*)";
>>>>>> + version="$(git describe --match 'v[0-9]*')";
>>>>>
>>>>> Do you have a pointer to a pipeline showing this fix works ?
>>
>> It worked on my fork but I have some versioned tag:
>> https://gitlab.com/philmd_rh/qemu/-/jobs/1553450025
>
> I can reproduce the error msg if I do a shallow clone with no history
>
> $ cd qemu
> $ git describe --match v[0-9]*
> v6.1.0-171-g5e8c1a0c90
>
> $ cd ..
> $ git clone --depth 1 https://gitlab.com/qemu-project/qemu/ qemu.new
> $ cd qemu.new/
> $ git describe --match v[0-9]*
> fatal: No names found, cannot describe anything.
>
> but the odd thing is that I think we should have been hitting the
> problem frequently if it was related to git depth. This job passes
> fine in current CI pipelines and my own fork.
FYI it didn't work out on Cédric fork:
https://gitlab.com/legoater/qemu/-/jobs/1553492082
next prev parent reply other threads:[~2021-09-01 16:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 14:52 [PATCH] gitlab: Escape git-describe match pattern on Windows hosts Philippe Mathieu-Daudé
2021-09-01 14:57 ` Daniel P. Berrangé
2021-09-01 15:17 ` Peter Maydell
2021-09-01 15:21 ` Daniel P. Berrangé
2021-09-01 15:35 ` Philippe Mathieu-Daudé
2021-09-01 15:53 ` Daniel P. Berrangé
2021-09-01 16:24 ` Philippe Mathieu-Daudé [this message]
2021-09-01 16:27 ` Cédric Le Goater
2021-09-01 16:40 ` Philippe Mathieu-Daudé
2021-09-01 16:47 ` Daniel P. Berrangé
2021-09-01 16:51 ` Philippe Mathieu-Daudé
2021-10-05 8:40 ` Cédric Le Goater
2021-10-05 8:43 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=33d1a40b-c242-6472-5aa4-4108668ccc84@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=clg@kaod.org \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).