[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/28] gitlab: fall back to commit hash in qemu-setup filename
From: |
Alex Bennée |
Subject: |
[PULL 13/28] gitlab: fall back to commit hash in qemu-setup filename |
Date: |
Wed, 9 Feb 2022 14:15:14 +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>
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
- [PULL 10/28] tests: Manually remove libxml2 on MSYS2 runners, (continued)
- [PULL 10/28] tests: Manually remove libxml2 on MSYS2 runners, Alex Bennée, 2022/02/09
- [PULL 21/28] plugins: add helper functions for coverage plugins, Alex Bennée, 2022/02/09
- [PULL 26/28] plugins: move reset of plugin data to tb_start, Alex Bennée, 2022/02/09
- [PULL 15/28] tests: Update CentOS 8 container to CentOS Stream 8, Alex Bennée, 2022/02/09
- [PULL 19/28] tracing: remove the trace-tcg includes from the build, Alex Bennée, 2022/02/09
- [PULL 28/28] include/exec: fix softmmu version of TARGET_ABI_FMT_lx, Alex Bennée, 2022/02/09
- [PULL 27/28] linux-user: Remove the deprecated ppc64abi32 target, Alex Bennée, 2022/02/09
- [PULL 16/28] tests/tcg/sh4: disable another unreliable test, Alex Bennée, 2022/02/09
- [PULL 20/28] tracing: excise the tcg related from tracetool, Alex Bennée, 2022/02/09
- [PULL 13/28] gitlab: fall back to commit hash in qemu-setup filename,
Alex Bennée <=
- [PULL 18/28] tracing: remove TCG memory access tracing, Alex Bennée, 2022/02/09
- [PULL 25/28] target/i386: use CPU_LOG_INT for IRQ servicing, Alex Bennée, 2022/02/09
- Re: [PULL 00/28] testing and plugin updates, Peter Maydell, 2022/02/12