6340af7a94
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>
48 lines
1.7 KiB
YAML
48 lines
1.7 KiB
YAML
.cross_system_build_job:
|
|
stage: build
|
|
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
|
|
timeout: 80m
|
|
script:
|
|
- mkdir build
|
|
- cd build
|
|
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
|
|
../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
|
|
--disable-user --target-list-exclude="arm-softmmu cris-softmmu
|
|
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
|
|
mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
|
|
sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
|
|
- 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]* 2>/dev/null || git rev-parse --short HEAD)";
|
|
mv -v qemu-setup*.exe qemu-setup-${version}.exe;
|
|
fi
|
|
|
|
# Job to cross-build specific accelerators.
|
|
#
|
|
# Set the $ACCEL variable to select the specific accelerator (default to
|
|
# KVM), and set extra options (such disabling other accelerators) via the
|
|
# $EXTRA_CONFIGURE_OPTS variable.
|
|
.cross_accel_build_job:
|
|
stage: build
|
|
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
|
|
timeout: 30m
|
|
script:
|
|
- mkdir build
|
|
- cd build
|
|
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
|
|
../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
|
|
--disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
|
|
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
|
|
|
|
.cross_user_build_job:
|
|
stage: build
|
|
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
|
|
script:
|
|
- mkdir build
|
|
- cd build
|
|
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
|
|
../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
|
|
--disable-system
|
|
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
|