qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Cc: "Willian Rampazzo" <willianr@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: Re: [PATCH 1/3] ci: build & store windows installer
Date: Mon, 5 Jul 2021 09:28:37 +0200	[thread overview]
Message-ID: <d8ec34a6-4d1c-7a07-b57f-3216d3f5efbb@redhat.com> (raw)
In-Reply-To: <20210623091137.1156959-2-kraxel@redhat.com>

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	other threads:[~2021-07-05  7:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23  9:11 [PATCH 0/3] [RfC] build windows installers in ci Gerd Hoffmann
2021-06-23  9:11 ` [PATCH 1/3] ci: build & store windows installer Gerd Hoffmann
2021-07-05  7:28   ` Thomas Huth [this message]
2021-07-05 14:44   ` Willian Rampazzo
2021-06-23  9:11 ` [PATCH 2/3] [hack] scripts/copy-dlls Gerd Hoffmann
2021-06-23  9:11 ` [PATCH 3/3] ci: build & store guest agent msi Gerd Hoffmann
2021-07-05  7:31   ` Thomas Huth
2021-07-05 14:47   ` Willian Rampazzo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d8ec34a6-4d1c-7a07-b57f-3216d3f5efbb@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=wainersm@redhat.com \
    --cc=willianr@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).