From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Willian Rampazzo" <willianr@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Cédric Le Goater" <clg@kaod.org>
Subject: Re: [PATCH] gitlab: Escape git-describe match pattern on Windows hosts
Date: Wed, 1 Sep 2021 15:57:14 +0100 [thread overview]
Message-ID: <YS+UylEr3CJyksxt@redhat.com> (raw)
In-Reply-To: <20210901145229.4132606-1-philmd@redhat.com>
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 is a bit strange to me. AFAICT, the only difference would
be if the unquoted v[0-9]* matched a filename in the
current directory, but that doesn't seem like it is the
case here.
Are you sure this isn't just caused by the setting
container-cross.yml: GIT_DEPTH: 1
ie we don't have the history depth needed to find any of the
historic git tags.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2021-09-01 14:58 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é [this message]
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é
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=YS+UylEr3CJyksxt@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=clg@kaod.org \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=kraxel@redhat.com \
--cc=philmd@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.