qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Greg Kurz" <groug@kaod.org>, "Gerd Hoffmann" <kraxel@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 13/28] gitlab: fall back to commit hash in qemu-setup filename
Date: Wed,  9 Feb 2022 14:15:14 +0000	[thread overview]
Message-ID: <20220209141529.3418384-14-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org>

From: Stefan Hajnoczi <stefanha@redhat.com>

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>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220125173454.10381-1-stefanha@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220204204335.1689602-14-alex.bennee@linaro.org>

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.30.2



  parent reply	other threads:[~2022-02-09 15:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-09 14:15 [PULL 00/28] testing and plugin updates Alex Bennée
2022-02-09 14:15 ` [PULL 01/28] tests/Makefile.include: clean-up old code Alex Bennée
2022-02-09 14:15 ` [PULL 02/28] tests/qtest: enable more vhost-user tests by default Alex Bennée
2022-02-09 14:15 ` [PULL 03/28] Makefile: also remove .gcno files when cleaning Alex Bennée
2022-02-09 14:15 ` [PULL 04/28] .gitignore: add .gcov pattern Alex Bennée
2022-02-09 14:15 ` [PULL 05/28] MAINTAINERS: Cover lcitool submodule with build test / automation Alex Bennée
2022-02-09 14:15 ` [PULL 06/28] gitmodules: Correct libvirt-ci submodule URL Alex Bennée
2022-02-09 14:15 ` [PULL 07/28] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Alex Bennée
2022-02-09 14:15 ` [PULL 08/28] drop libxml2 checks since libxml is not actually used (for parallels) Alex Bennée
2022-02-09 14:15 ` [PULL 09/28] tests/lcitool: Refresh submodule and remove libxml2 Alex Bennée
2022-02-09 14:15 ` [PULL 10/28] tests: Manually remove libxml2 on MSYS2 runners Alex Bennée
2022-02-09 14:15 ` [PULL 11/28] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Alex Bennée
2022-02-09 14:15 ` [PULL 12/28] docs/devel: mention our .editorconfig Alex Bennée
2022-02-09 14:15 ` Alex Bennée [this message]
2022-02-09 14:15 ` [PULL 14/28] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too Alex Bennée
2022-02-09 14:15 ` [PULL 15/28] tests: Update CentOS 8 container to CentOS Stream 8 Alex Bennée
2022-02-15  7:49   ` Philippe Mathieu-Daudé via
2022-02-09 14:15 ` [PULL 16/28] tests/tcg/sh4: disable another unreliable test Alex Bennée
2022-02-09 14:15 ` [PULL 17/28] docs: remove references to TCG tracing Alex Bennée
2022-02-09 14:15 ` [PULL 18/28] tracing: remove TCG memory access tracing Alex Bennée
2022-02-09 14:15 ` [PULL 19/28] tracing: remove the trace-tcg includes from the build Alex Bennée
2022-02-09 14:15 ` [PULL 20/28] tracing: excise the tcg related from tracetool Alex Bennée
2022-02-09 14:15 ` [PULL 21/28] plugins: add helper functions for coverage plugins Alex Bennée
2022-02-09 14:15 ` [PULL 22/28] contrib/plugins: add a drcov plugin Alex Bennée
2022-02-09 14:15 ` [PULL 23/28] tests/plugin: allow libinsn.so per-CPU counts Alex Bennée
2022-02-09 14:15 ` [PULL 24/28] tests/plugins: add instruction matching to libinsn.so Alex Bennée
2022-02-09 14:15 ` [PULL 25/28] target/i386: use CPU_LOG_INT for IRQ servicing Alex Bennée
2022-02-09 14:15 ` [PULL 26/28] plugins: move reset of plugin data to tb_start Alex Bennée
2022-02-09 14:15 ` [PULL 27/28] linux-user: Remove the deprecated ppc64abi32 target Alex Bennée
2022-02-09 14:15 ` [PULL 28/28] include/exec: fix softmmu version of TARGET_ABI_FMT_lx Alex Bennée
2022-02-12 22:03 ` [PULL 00/28] testing and plugin updates Peter Maydell

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=20220209141529.3418384-14-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=groug@kaod.org \
    --cc=kraxel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@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).