1. Patchew
  2. QEMU
  3. View series

[PATCH] gitlab: fall back to commit hash in qemu-setup filename

Stefan Hajnoczi posted 1 patch 2 years, 3 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220125173454.10381-1-stefanha@redhat.com
.gitlab-ci.d/crossbuild-template.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] gitlab: fall back to commit hash in qemu-setup filename
Posted by Stefan Hajnoczi 2 years, 3 months ago 
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
 
-- 
2.34.1
Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
Posted by Greg Kurz 2 years, 3 months ago 
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
>
Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
Posted by Philippe Mathieu-Daudé via 2 years, 3 months ago 
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>
Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
Posted by Alex Bennée 2 years, 2 months ago 
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
Re: [PATCH] gitlab: fall back to commit hash in qemu-setup filename
Posted by Thomas Huth 2 years, 3 months ago 
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>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.