From patchwork Wed Jun 23 09:11:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 1495994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OJG+NTOj; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G8yG21Hxxz9sRN for ; Wed, 23 Jun 2021 19:12:26 +1000 (AEST) Received: from localhost ([::1]:57428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvyvn-0004UG-UG for incoming@patchwork.ozlabs.org; Wed, 23 Jun 2021 05:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyvQ-0004PX-8P for qemu-devel@nongnu.org; Wed, 23 Jun 2021 05:12:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyvN-00080L-1q for qemu-devel@nongnu.org; Wed, 23 Jun 2021 05:12:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624439515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lc5+MlIaN0SpBeuLPgviWkcFxoVDKJsKZrBsgN0Ih9I=; b=OJG+NTOjgjNNkf0l/e/ujiSA6+4najsmXHTzX/cK/KDN7XE4ZE+xr8TO94zLwEWte8fvUi L2mT4ltTd7CE6gffjy38R5iB8cJIrWhhPHOwT3Lu4CsfEFDm/MYuX2TO0L+TtkCkMHBf6a kOxRmbcK86B1p72K4IHIPXTddCKZ3C4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-75-qH-kJLY1PCeIP6SpMFvkPA-1; Wed, 23 Jun 2021 05:11:54 -0400 X-MC-Unique: qH-kJLY1PCeIP6SpMFvkPA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 61BDE100CA89; Wed, 23 Jun 2021 09:11:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0CEF65C1CF; Wed, 23 Jun 2021 09:11:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 659971800916; Wed, 23 Jun 2021 11:11:37 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/3] ci: build & store windows installer Date: Wed, 23 Jun 2021 11:11:35 +0200 Message-Id: <20210623091137.1156959-2-kraxel@redhat.com> In-Reply-To: <20210623091137.1156959-1-kraxel@redhat.com> References: <20210623091137.1156959-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.223, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Build windows installer for qemu in gitlab CI, store the result as artifact. Signed-off-by: Gerd Hoffmann Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .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 \ From patchwork Wed Jun 23 09:11:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 1495996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=So3m5MOf; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G8yJC4qX1z9sRN for ; Wed, 23 Jun 2021 19:14:19 +1000 (AEST) Received: from localhost ([::1]:36208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvyxd-0000kk-Di for incoming@patchwork.ozlabs.org; Wed, 23 Jun 2021 05:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyva-0004wL-1e for qemu-devel@nongnu.org; Wed, 23 Jun 2021 05:12:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyvY-0008CU-8s for qemu-devel@nongnu.org; Wed, 23 Jun 2021 05:12:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624439527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6DN7xXCj6GeyayX+Sce1wD//G94eg+PlnAGbkon3TEk=; b=So3m5MOfok8ppSBcU4O6/cQ7HXRlC05fIjeNaWZkRpoUy58vtjBMtNjvBbg1Y+DyZbScvs a33ceXaw2nJUe9p5a6W9Qu8Na8HH14C2/8UFLLz6j7x1bxiK5D4Knxxy0PBFhU5KZ4YSTp 6V9P/VJ1acOe2UoiU/Vl37tOSoTwoK4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-4iveC3tfOW-e1MRK8Z5k1A-1; Wed, 23 Jun 2021 05:12:06 -0400 X-MC-Unique: 4iveC3tfOW-e1MRK8Z5k1A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36967100CA88; Wed, 23 Jun 2021 09:12:05 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1952960C13; Wed, 23 Jun 2021 09:11:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 729571800917; Wed, 23 Jun 2021 11:11:37 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/3] [hack] scripts/copy-dlls Date: Wed, 23 Jun 2021 11:11:36 +0200 Message-Id: <20210623091137.1156959-3-kraxel@redhat.com> In-Reply-To: <20210623091137.1156959-1-kraxel@redhat.com> References: <20210623091137.1156959-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.223, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Gerd Hoffmann --- .gitlab-ci.d/crossbuild-template.yml | 3 +- scripts/copy-dlls | 56 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100755 scripts/copy-dlls diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 7d3ad00a1eb9..5411177935fc 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -12,7 +12,8 @@ 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 scripts/copy-dlls; + make installer; version="$(git describe --match v[0-9]*)"; mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi diff --git a/scripts/copy-dlls b/scripts/copy-dlls new file mode 100755 index 000000000000..0a84cd004c87 --- /dev/null +++ b/scripts/copy-dlls @@ -0,0 +1,56 @@ +#!/bin/sh +# +# copy dlls needed by windows binaries to $srcdir/dll/{w32,w64} +# the nsis installer scripts expects them there +# +# TODO: rewrite in python and integrate into scripts/nsis.py +# + +if test ! -f config-host.mak; then + echo "must be started in builddir" + exit 1 +fi + +eval $(egrep '(CONFIG_WIN32|QEMU_GA_MSI_MINGW_DLL_PATH|SRC_PATH)' config-host.mak) + +if test "$CONFIG_WIN32" != "y"; then + echo "not a windows build" + exit 1 +fi + +if test "$QEMU_GA_MSI_MINGW_DLL_PATH" = ""; then + echo "unknown dll path" + exit 1 +fi + +case "$QEMU_GA_MSI_MINGW_DLL_PATH" in + *-w32-*) + DESTDIR="$SRC_PATH/dll/w32" + ;; + *-w64-*) + DESTDIR="$SRC_PATH/dll/w64" + ;; + *) + echo "can't figure w32 vs. w64" + exit 1 + ;; +esac + +function check_windows_binary_deps() { + local file="$1" + local dlls dll + + dlls=$(objdump -p "$file" | awk '/DLL Name/ { print $3 }') + for dll in $dlls; do + test -f "$QEMU_GA_MSI_MINGW_DLL_PATH/$dll" || continue + test -f "$DESTDIR/$dll" && continue + echo "copy $dll" + cp "$QEMU_GA_MSI_MINGW_DLL_PATH/$dll" "$DESTDIR/$dll" + check_windows_binary_deps "$DESTDIR/$dll" + done +} + +mkdir -p "$DESTDIR" +for file in *.exe; do + check_windows_binary_deps $file +done From patchwork Wed Jun 23 09:11:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 1495995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GG2J2uXP; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G8yHw1qWPz9sRN for ; Wed, 23 Jun 2021 19:14:04 +1000 (AEST) Received: from localhost ([::1]:34516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvyxN-00083J-VP for incoming@patchwork.ozlabs.org; Wed, 23 Jun 2021 05:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyve-0005CZ-BY for qemu-devel@nongnu.org; Wed, 23 Jun 2021 05:12:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45832) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyvc-0008J9-L3 for qemu-devel@nongnu.org; Wed, 23 Jun 2021 05:12:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624439532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sgeRR5DoQxtWwABkFtrtDao9zG6b7rurzBpiz+pUsGo=; b=GG2J2uXP8eAuwl4jMLEA+xHe5hkgP4yAo0zFwKX+MegQ8CvOX/DGZI+jMoDkF2cVKp/JGy mVY7utVOVNJTwoj4T9J5x20XBRuglDM1bym2w+7qllge/flb2003kaahaxWhGvWckyImZ2 Yjs3P3JwrdjVN+MDyDVvPcemqVEdEms= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-6SydkJpCO3SP7mWZ6tbiVA-1; Wed, 23 Jun 2021 05:12:10 -0400 X-MC-Unique: 6SydkJpCO3SP7mWZ6tbiVA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0CF79F934; Wed, 23 Jun 2021 09:12:09 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2F13100F49F; Wed, 23 Jun 2021 09:11:55 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 82E321800918; Wed, 23 Jun 2021 11:11:37 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 3/3] ci: build & store guest agent msi Date: Wed, 23 Jun 2021 11:11:37 +0200 Message-Id: <20210623091137.1156959-4-kraxel@redhat.com> In-Reply-To: <20210623091137.1156959-1-kraxel@redhat.com> References: <20210623091137.1156959-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.223, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Build guest agent windows msi install package in gitlab CI, store the result as artifact. Signed-off-by: Gerd Hoffmann Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .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 \