* Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
2022-01-25 17:34 [PATCH] gitlab: fall back to commit hash in qemu-setup filename Stefan Hajnoczi
@ 2022-01-25 17:47 ` Greg Kurz
2022-01-25 18:05 ` Philippe Mathieu-Daudé via
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Greg Kurz @ 2022-01-25 17:47 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: Thomas Huth, Beraldo Leal, Philippe Mathieu-Daudé,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
qemu-devel, Gerd Hoffmann, Alex Bennée
On Tue, 25 Jan 2022 17:34:54 +0000
Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Personal repos may not have release tags (v6.0.0, v6.1.0, etc) and this
> causes cross_system_build_job to fail when pretty-printing a unique
> qemu-setup-*.exe name:
>
> version="$(git describe --match v[0-9]*)";
> ^^^^^^^^^^ fails ^^^^^^^^^^^
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
>
> Fall back to the short commit hash if necessary. This fixes CI failures
> that Greg Kurz and I experienced in our personal repos.
>
> Cc: Greg Kurz <groug@kaod.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
Thanks for the green CI !
Reviewed-by: Greg Kurz <groug@kaod.org>
> .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 10d22dcf6c..29c3c2b826 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]* 2>/dev/null || git rev-parse --short HEAD)";
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
> fi
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
2022-01-25 17:34 [PATCH] gitlab: fall back to commit hash in qemu-setup filename Stefan Hajnoczi
2022-01-25 17:47 ` Greg Kurz
@ 2022-01-25 18:05 ` Philippe Mathieu-Daudé via
2022-01-26 8:53 ` Thomas Huth
2022-01-28 16:47 ` Alex Bennée
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-25 18:05 UTC (permalink / raw)
To: Stefan Hajnoczi, qemu-devel
Cc: Wainer dos Santos Moschetta, Alex Bennée, Thomas Huth,
Beraldo Leal, Greg Kurz, Gerd Hoffmann,
Philippe Mathieu-Daudé
On 1/25/22 18:34, Stefan Hajnoczi wrote:
> Personal repos may not have release tags (v6.0.0, v6.1.0, etc) and this
> causes cross_system_build_job to fail when pretty-printing a unique
> qemu-setup-*.exe name:
>
> version="$(git describe --match v[0-9]*)";
> ^^^^^^^^^^ fails ^^^^^^^^^^^
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
>
> Fall back to the short commit hash if necessary. This fixes CI failures
> that Greg Kurz and I experienced in our personal repos.
This answers this thread:
https://lore.kernel.org/qemu-devel/YVwQRyD6FxrB9qgd@redhat.com/
> Cc: Greg Kurz <groug@kaod.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@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 10d22dcf6c..29c3c2b826 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]* 2>/dev/null || git rev-parse --short HEAD)";
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
> fi
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
2022-01-25 17:34 [PATCH] gitlab: fall back to commit hash in qemu-setup filename Stefan Hajnoczi
2022-01-25 17:47 ` Greg Kurz
2022-01-25 18:05 ` Philippe Mathieu-Daudé via
@ 2022-01-26 8:53 ` Thomas Huth
2022-01-28 16:47 ` Alex Bennée
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2022-01-26 8:53 UTC (permalink / raw)
To: Stefan Hajnoczi, qemu-devel, Alex Bennée
Cc: Beraldo Leal, Greg Kurz, Wainer dos Santos Moschetta,
Philippe Mathieu-Daudé, Gerd Hoffmann,
Philippe Mathieu-Daudé
On 25/01/2022 18.34, Stefan Hajnoczi wrote:
> Personal repos may not have release tags (v6.0.0, v6.1.0, etc) and this
> causes cross_system_build_job to fail when pretty-printing a unique
> qemu-setup-*.exe name:
>
> version="$(git describe --match v[0-9]*)";
> ^^^^^^^^^^ fails ^^^^^^^^^^^
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
>
> Fall back to the short commit hash if necessary. This fixes CI failures
> that Greg Kurz and I experienced in our personal repos.
>
> Cc: Greg Kurz <groug@kaod.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@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 10d22dcf6c..29c3c2b826 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]* 2>/dev/null || git rev-parse --short HEAD)";
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
> fi
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
2022-01-25 17:34 [PATCH] gitlab: fall back to commit hash in qemu-setup filename Stefan Hajnoczi
` (2 preceding siblings ...)
2022-01-26 8:53 ` Thomas Huth
@ 2022-01-28 16:47 ` Alex Bennée
3 siblings, 0 replies; 5+ messages in thread
From: Alex Bennée @ 2022-01-28 16:47 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: Thomas Huth, Beraldo Leal, qemu-devel, Greg Kurz,
Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
Gerd Hoffmann, Philippe Mathieu-Daudé
Stefan Hajnoczi <stefanha@redhat.com> writes:
> Personal repos may not have release tags (v6.0.0, v6.1.0, etc) and this
> causes cross_system_build_job to fail when pretty-printing a unique
> qemu-setup-*.exe name:
>
> version="$(git describe --match v[0-9]*)";
> ^^^^^^^^^^ fails ^^^^^^^^^^^
> mv -v qemu-setup*.exe qemu-setup-${version}.exe;
>
> Fall back to the short commit hash if necessary. This fixes CI failures
> that Greg Kurz and I experienced in our personal repos.
>
> Cc: Greg Kurz <groug@kaod.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Queued to update-plugins-next-280122, thanks.
--
Alex Bennée
^ permalink raw reply [flat|nested] 5+ messages in thread