[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/3] ci: build & store guest agent msi
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 2/3] ci: build & store guest agent msi |
Date: |
Mon, 26 Jul 2021 17:52:34 +0200 |
Build guest agent windows msi install package in gitlab CI,
store the result as artifact.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
.gitlab-ci.d/crossbuild-template.yml | 3 ++-
.gitlab-ci.d/crossbuilds.yml | 2 ++
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 +
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/crossbuild-template.yml
b/.gitlab-ci.d/crossbuild-template.yml
index 7d3ad00a1eb9..12f78e81de0d 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -12,9 +12,10 @@
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;
+ then make installer msi;
version="$(git describe --match v[0-9]*)";
mv -v qemu-setup*.exe qemu-setup-${version}.exe;
+ mv -v qga/*.msi $(basename qga/*.msi .msi)-${version}.msi;
fi
# Job to cross-build specific accelerators.
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 4ff3aa3cfcdd..fc14a1cf5c10 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -163,6 +163,7 @@ cross-win32-system:
artifacts:
paths:
- build/qemu-setup*.exe
+ - build/qemu-ga*.msi
cross-win64-system:
extends: .cross_system_build_job
@@ -173,6 +174,7 @@ cross-win64-system:
artifacts:
paths:
- build/qemu-setup*.exe
+ - build/qemu-ga*.msi
cross-amd64-xen-only:
extends: .cross_accel_build_job
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 5a03e1af43ac..f198927ef56b 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -28,6 +28,7 @@ ENV PACKAGES \
mingw32-pixman \
mingw32-pkg-config \
mingw32-SDL2 \
+ msitools \
perl \
perl-Test-Harness \
python3 \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index d3f13666e82e..fc0b3bf02eff 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -25,6 +25,7 @@ ENV PACKAGES \
mingw64-libtasn1 \
mingw64-pixman \
mingw64-pkg-config \
+ msitools \
perl \
perl-Test-Harness \
python3 \
--
2.31.1