qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/3] ci: build & store windows installer


From: Thomas Huth
Subject: Re: [PATCH 1/3] ci: build & store windows installer
Date: Mon, 5 Jul 2021 09:28:37 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0

On 23/06/2021 11.11, Gerd Hoffmann wrote:
Build windows installer for qemu in gitlab CI,
store the result as artifact.

Signed-off-by: Gerd Hoffmann <kraxel@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 1be541174c91..7d3ad00a1eb9 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 6b3865c9e83e..4ff3aa3cfcdd 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 f53007ac865e..5fbfe8892896 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 \


Reviewed-by: Thomas Huth <thuth@redhat.com>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]