1. Patchew
  2. QEMU
  3. [PATCH 0/3] [RfC] build windows installers in ci
  4. View patch

[PATCH 3/3] ci: build & store guest agent msi

Gerd Hoffmann posted 3 patches 4 years, 7 months ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Willian Rampazzo <willianr@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>
There is a newer version of this series
[PATCH 3/3] ci: build & store guest agent msi
Posted by Gerd Hoffmann 4 years, 7 months ago 
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 5411177935fc..507440af0f4e 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -13,9 +13,10 @@
     - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
     - if grep -q "EXESUF=.exe" config-host.mak;
       then scripts/copy-dlls;
-      make installer;
+      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 a638afb525ce..9fffc8e73881 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 5fbfe8892896..d748c37c4aa4 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
Re: [PATCH 3/3] ci: build & store guest agent msi
Posted by Thomas Huth 4 years, 7 months ago 
On 23/06/2021 11.11, Gerd Hoffmann wrote:
> 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 5411177935fc..507440af0f4e 100644
> --- a/.gitlab-ci.d/crossbuild-template.yml
> +++ b/.gitlab-ci.d/crossbuild-template.yml
> @@ -13,9 +13,10 @@
>       - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
>       - if grep -q "EXESUF=.exe" config-host.mak;
>         then scripts/copy-dlls;
> -      make installer;
> +      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 a638afb525ce..9fffc8e73881 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 5fbfe8892896..d748c37c4aa4 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 \
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH 3/3] ci: build & store guest agent msi
Posted by Willian Rampazzo 4 years, 7 months ago 
On Wed, Jun 23, 2021 at 6:12 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> 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(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.