[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/25] gitlab: fall back to commit hash in qemu-setup filename
From: |
Alex Bennée |
Subject: |
[PATCH v2 13/25] gitlab: fall back to commit hash in qemu-setup filename |
Date: |
Tue, 1 Feb 2022 18:20:38 +0000 |
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>
---
.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.30.2
- [PATCH v2 06/25] gitmodules: Correct libvirt-ci submodule URL, (continued)
- [PATCH v2 06/25] gitmodules: Correct libvirt-ci submodule URL, Alex Bennée, 2022/02/01
- [PATCH v2 03/25] Makefile: also remove .gcno files when cleaning, Alex Bennée, 2022/02/01
- [PATCH v2 02/25] tests/qtest: enable more vhost-user tests by default, Alex Bennée, 2022/02/01
- [PATCH v2 11/25] tests/lcitool: Install libibumad to cover RDMA on Debian based distros, Alex Bennée, 2022/02/01
- [PATCH v2 25/25] plugins: move reset of plugin data to tb_start, Alex Bennée, 2022/02/01
- [PATCH v2 08/25] drop libxml2 checks since libxml is not actually used (for parallels), Alex Bennée, 2022/02/01
- [PATCH v2 12/25] docs/devel: mention our .editorconfig, Alex Bennée, 2022/02/01
- [PATCH v2 09/25] tests/lcitool: Refresh submodule and remove libxml2, Alex Bennée, 2022/02/01
- [PATCH v2 16/25] docs: remove references to TCG tracing, Alex Bennée, 2022/02/01
- [PATCH v2 13/25] gitlab: fall back to commit hash in qemu-setup filename,
Alex Bennée <=
- [PATCH v2 07/25] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files, Alex Bennée, 2022/02/01
- [PATCH v2 15/25] block: fix FreeBSD build failure with fallocate, Alex Bennée, 2022/02/01
- [PATCH v2 05/25] MAINTAINERS: Cover lcitool submodule with build test / automation, Alex Bennée, 2022/02/01
- [PATCH v2 14/25] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too, Alex Bennée, 2022/02/01
- [PATCH v2 10/25] tests: Manually remove libxml2 on MSYS2 runners, Alex Bennée, 2022/02/01
- [PATCH v2 19/25] tracing: excise the tcg related from tracetool, Alex Bennée, 2022/02/01
- [PATCH v2 21/25] contrib/plugins: add a drcov plugin, Alex Bennée, 2022/02/01
- [PATCH v2 18/25] tracing: remove the trace-tcg includes from the build, Alex Bennée, 2022/02/01