[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/5] ci: build & store windows installer
From: |
Thomas Huth |
Subject: |
[PULL 1/5] ci: build & store windows installer |
Date: |
Mon, 19 Jul 2021 12:26:36 +0200 |
From: Gerd Hoffmann <kraxel@redhat.com>
Build windows installer for qemu in gitlab CI,
store the result as artifact.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210623091137.1156959-2-kraxel@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/crossbuild-template.yml | 5 +++++
.gitlab-ci.d/crossbuilds.yml | 6 ++++++
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
3 files changed, 12 insertions(+)
diff --git a/.gitlab-ci.d/crossbuild-template.yml
b/.gitlab-ci.d/crossbuild-template.yml
index 1be541174c..7d3ad00a1e 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -11,6 +11,11 @@
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu"
- 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]*)";
+ mv -v qemu-setup*.exe qemu-setup-${version}.exe;
+ fi
# Job to cross-build specific accelerators.
#
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 6b3865c9e8..4ff3aa3cfc 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -160,6 +160,9 @@ cross-win32-system:
job: win32-fedora-cross-container
variables:
IMAGE: fedora-win32-cross
+ artifacts:
+ paths:
+ - build/qemu-setup*.exe
cross-win64-system:
extends: .cross_system_build_job
@@ -167,6 +170,9 @@ cross-win64-system:
job: win64-fedora-cross-container
variables:
IMAGE: fedora-win64-cross
+ artifacts:
+ paths:
+ - build/qemu-setup*.exe
cross-amd64-xen-only:
extends: .cross_accel_build_job
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index ff706040c4..d3f13666e8 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -13,6 +13,7 @@ ENV PACKAGES \
hostname \
make \
meson \
+ mingw32-nsis \
mingw64-bzip2 \
mingw64-curl \
mingw64-glib2 \
--
2.27.0
- [PULL 0/5] Misc fixes for 6.1, Thomas Huth, 2021/07/19
- [PULL 1/5] ci: build & store windows installer,
Thomas Huth <=
- [PULL 2/5] configure: Fix endianess test with LTO, Thomas Huth, 2021/07/19
- [PULL 3/5] hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue, Thomas Huth, 2021/07/19
- [PULL 5/5] hw/ide: Fix crash when plugging a piix3-ide device into the x-remote machine, Thomas Huth, 2021/07/19
- [PULL 4/5] hw/net/net_tx_pkt: Fix crash detected by fuzzer, Thomas Huth, 2021/07/19
- Re: [PULL 0/5] Misc fixes for 6.1, Peter Maydell, 2021/07/19