From patchwork Wed Mar 22 13:57:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 665885 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp166159wrt; Wed, 22 Mar 2023 06:58:22 -0700 (PDT) X-Google-Smtp-Source: AKy350YtoFqtCQlq8HYeCWy6FxNYfn8gKRgPzGnW+vZ4Fyd58tQxo1utqVhGpe9NhZJzTGwp9Iom X-Received: by 2002:a05:6214:76f:b0:5d9:a36d:3ed2 with SMTP id f15-20020a056214076f00b005d9a36d3ed2mr1288883qvz.45.1679493501964; Wed, 22 Mar 2023 06:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679493501; cv=none; d=google.com; s=arc-20160816; b=i6HZi2y6/Bdy6Pk2OauLzRsmMDqnYdYN+RA3byFF8zLUlFOyDCx3DvICquP/3qUOlH x0eWJk4rriAUqZzfYAi+DddMAaWYX5pHtcmXSs5VVO/Gf0CWT0fdsgYxt7U4GUoarf9+ 8/AvcFqp+ElQS8yZjTnN7PM5NbiwAfYmtbjI5jw0ZK6v5Zz1yVeLdQaDTexyA8MiqCJt 8HMWkH9xiGN89tmTclvt2ZSO4QcuxOy0qDIEZ36jy2puShGnISylB0iWiJy3rsxulDTw mFP/VcqYhikbw5Uwn1UGpyawVHaAs1w0Rp0go+D/5jac/LIWWFPzoeY2z8ZU32cW2Ypm +2dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uI/PqPnh+syqktubN6Cm0y9rYGZLvTWBD1kNl80Dgig=; b=gNLpNtW4jD9/+tXASSbcz8/uejpUkiGGpPZ+50NPfNH2YkDLncX7Q1W7py8jK8iK/s pJbStf4Wd5STQNVW4mtLOBIIhy+uqj0PvnHSVxPfbar9NPndzZGwbuwHAM8oKtmr/IzV FiwTBON40s67gP/vu0xISe8BxhdotsRb+BsZL9MvQwiz6J4EzhdOeKaksSDkELs3bOQ+ PA5cwyxBSwAXAz1PwBn2NER4gKFVh9y5Qm9WWATC0kx4RaleKcgEKHI83uOfmP9DM2em lnLn3SuNwkTjEI2Gic/nggQzckPERpESoZMLoxPqKhnnnEYYHxR0Tf+Tuz21JCd0GIj0 Di5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vxi78SET; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 90-20020a0c8063000000b005726e8242afsi9899488qva.32.2023.03.22.06.58.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Mar 2023 06:58:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vxi78SET; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peyy5-0000zZ-WA; Wed, 22 Mar 2023 09:57:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peyy4-0000z7-TA for qemu-devel@nongnu.org; Wed, 22 Mar 2023 09:57:32 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peyy3-00018b-8W for qemu-devel@nongnu.org; Wed, 22 Mar 2023 09:57:32 -0400 Received: by mail-wr1-x434.google.com with SMTP id l12so17173439wrm.10 for ; Wed, 22 Mar 2023 06:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679493449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uI/PqPnh+syqktubN6Cm0y9rYGZLvTWBD1kNl80Dgig=; b=vxi78SETQOIfBY5C9bYL0F6CtD0NG38r2kCWBIk+qRMt6975wQWmipc9BTSm5sAjAJ oUX62Q9pgGgaWsQn7C/By1Uyx+jLOfG7aMPJFXF1LeHOSeUBXRBsLS0GKPTaKXPJJ2Uo oS31NupZs3N33qGNEljbMk3dlWZ+EaoBzU8V94YYcLJBaAOsZS3Fn0cRQIt/2LQ2FYzC QCP5niel7h5nDseZ7tMWtAH6mh9Kh013G8CIdn5e/X2LweZr5zHHImwdRUdEHxJaSp2m XFnYaSr/3UeNQ01Dhg22whtCh0i6b9UqA2ytk3UmfY+DL3zD0NzEwX5utLRfCmirw0Qs lpIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679493449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uI/PqPnh+syqktubN6Cm0y9rYGZLvTWBD1kNl80Dgig=; b=qYC13beLh5zc/y2ROykw0eGoWiRnAhovrWeY4tRCir5cfiPfKOSfNztHYye7uxbu8S Zsjt4Dd1vJ3U5i6cKt6z3Zr0F/BVgCajjSBvEzMoCFe52GwFGFLifSC8Omqm7RiLajrh zyBt4Bb44Wd6bqy19zNFk+3gqFQveIDjcf2i0NU4RkdQkVk4weTxkCqT2S08MdM2HfrU WkX5EPyoWLGSC3HKM6cQrse5JQK9foEqMGHzlzlcJ6s3VZ2PMsYzmp9iH6oifK/4+6w2 ixfHXFRdDBr/qKcC2h8vZEZhFBE6aCHhGQwz4Suk9tlUxY1vz2kPVsrxbPn5QJt0Eh0F UDUw== X-Gm-Message-State: AO0yUKVUs9AJxGnio39S+952nYlTZKr0bmL+N16PsZh1X+7MHRT1Qr8Y mbzD3FfoFrJPL2Dp1IShFgjqRmgPSjkF374iHv6Csw== X-Received: by 2002:adf:ebcf:0:b0:2cf:f35b:9aa2 with SMTP id v15-20020adfebcf000000b002cff35b9aa2mr5499493wrn.19.1679493449667; Wed, 22 Mar 2023 06:57:29 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id k5-20020adfe8c5000000b002d748d46565sm7188703wrn.74.2023.03.22.06.57.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Mar 2023 06:57:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , Jintao Yin , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yonggang Luo , Wainer dos Santos Moschetta , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= Subject: [PATCH v2 1/2] gitlab-ci: Cover SPICE in the MSYS2 job Date: Wed, 22 Mar 2023 14:57:20 +0100 Message-Id: <20230322135721.61138-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230322135721.61138-1-philmd@linaro.org> References: <20230322135721.61138-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Include the mingw-w64-x86_64-spice package so SPICE is covered: C compiler for the host machine: cc -m64 -mcx16 (gcc 12.2.0 "cc (Rev10, Built by MSYS2 project) 12.2.0") ... Run-time dependency spice-protocol found: YES 0.14.4 Run-time dependency spice-server found: YES 0.15.1 In particular this would have helped catching the build issue reported as https://gitlab.com/qemu-project/qemu/-/issues/1553: [1851/5253] Compiling C object libcommon.fa.p/ui_spice-core.c.obj FAILED: libcommon.fa.p/ui_spice-core.c.obj ../ui/spice-core.c: In function 'watch_remove': ../ui/spice-core.c:152:5: error: implicit declaration of function 'qemu_close_to_socket' [-Werror=implicit-function-declaration] 152 | qemu_close_to_socket(watch->fd); | ^~~~~~~~~~~~~~~~~~~~ ../ui/spice-core.c:152:5: error: nested extern declaration of 'qemu_close_to_socket' [-Werror=nested-externs] Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- See https://gitlab.com/philmd/qemu/-/jobs/3980693656#L2378 --- .gitlab-ci.d/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 87235e43b4..472bacd2e2 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -59,6 +59,7 @@ msys2-64bit: mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-snappy + mingw-w64-x86_64-spice mingw-w64-x86_64-usbredir mingw-w64-x86_64-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory @@ -108,6 +109,7 @@ msys2-32bit: mingw-w64-i686-SDL2 mingw-w64-i686-SDL2_image mingw-w64-i686-snappy + mingw-w64-i686-spice mingw-w64-i686-usbredir mingw-w64-i686-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory From patchwork Wed Mar 22 13:57:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 665886 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp166303wrt; Wed, 22 Mar 2023 06:58:44 -0700 (PDT) X-Google-Smtp-Source: AK7set92rIfvIg5xy+p/XLxxmQpnKfVL9bLYFY7Dp1FeAsT++bxSimcKbI2TgMf6Xl303sUhMYul X-Received: by 2002:ad4:594d:0:b0:5c0:abe:2662 with SMTP id eo13-20020ad4594d000000b005c00abe2662mr6165142qvb.34.1679493524300; Wed, 22 Mar 2023 06:58:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679493524; cv=none; d=google.com; s=arc-20160816; b=03BmaXU89tIK3ZaM/h5qBo5p9ZvIoebIIbgUD2oGT0H/G/q2s2RPsNrDVqe3yjePAG GpeU5r08o8aR9r4vDjQHJAd7aY3yyGBIe1ijMOpB3mTI4ooMUXXN2FHI2+cvvongXD5y 1rEDfSHfmDUn6vashAKvHmbkZmRa/iDMUzC7SLzP7RLDMTcVmpTaix9Miapgi9smtI1s LC97HDO0XQ8Ob6kuyxtW8SNbCv8Ol0Pc/Qc4czN++KoohnPqSjtHdAWtv118m1TxKL8H 1n0e68a7Nx//DFyAfuy2hyGXbvrhC20Vxs5FcLPRuHbRXnZGBITkVN1fgDKk5kyjuz7e 0w4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RefK/fZ4A/1aRNykjhv1QicsTPvUD23obAEq0f+RH2M=; b=FOOfCBg56eQMOOLUowWlv9MSmRuzMCnbXElMitG/KNu70Ho4muQe/3SfR1/vIHVs0R epZDQ7qfFWN0dIpFkCDgdVywhuBSrIG8aLUgc937GWuiSdcAd4fr+UQxyLzzB02VSSmg eG5LmRzTFB/ukixnPGl3ityaFEwJtkWNn0prR1PXJApI80CFIXB5OzJFNWvgOK+ggClI 6PnyzoeYBALJBue01SRKbrf6gbokbpicbnWbPqSLBnhiReO/OKSBxFVGoj5HbuqJ9+jh M1WdjZ30ElmwWkUnYKbeRH3HLdKS/sFILWviuDjCcDIBgxPC4S8GjBtZL74DxmDOsrl4 MrIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lDbzIpvI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bt5-20020ad455c5000000b005ac81946c7esi9923055qvb.398.2023.03.22.06.58.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Mar 2023 06:58:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lDbzIpvI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peyyB-00010P-Bk; Wed, 22 Mar 2023 09:57:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peyyA-000104-Bs for qemu-devel@nongnu.org; Wed, 22 Mar 2023 09:57:38 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peyy8-0001AG-AP for qemu-devel@nongnu.org; Wed, 22 Mar 2023 09:57:38 -0400 Received: by mail-wm1-x334.google.com with SMTP id p16so11596859wmq.5 for ; Wed, 22 Mar 2023 06:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679493455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RefK/fZ4A/1aRNykjhv1QicsTPvUD23obAEq0f+RH2M=; b=lDbzIpvIs2/ob8sRd8N6Sa31gd+8SAMM533la7Vg7oCEhMYKggbmayEg9zBA+fwFbT qfIHiH8hE0p09EXHnqkMmctP8qSMi5Z21NAFW8iiO6UH7cSNxb3FtVJOzT508h0ZStGJ 404+F3Gf8lDtKXEj8I8qDMl28pumCSZ3VWGE2MZI5djmWykhMibsCHyDA/bA9OFoi4dH mE8exCvMPoTUIG2+k2a+Uxa9WAGRRuCdzbHvp6IFiBSiiAlLdN7GXSl23vsvzXciPF82 A49e6Hgq9tSvicy2aYAnq6de/VlwiDExdal99SvfKX6o6z7L8O3kNPotYukPZj8ZNYZV +Smg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679493455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RefK/fZ4A/1aRNykjhv1QicsTPvUD23obAEq0f+RH2M=; b=gAOtSCj80Dvedgynu/FwtLBsU8om6S7kC7qJreVaqgMNyQM1EMNHlAj0w1YpJa19hk bVZvJldDR7fQWF1QbmFhrdj3VZYSUJgLhU13nSrm7zq7TfeToKioxP1ir90a42S1fwIX v2bH7rSHh0FeNRu3ieJ96HygmVKGkucZDd2uCp5pcy0vF95YWsKXrxYo217uaXsBDa5H CUecGpsO4fUzKXRpw6/oZK4jLhVocnNqBb2VWj2BHNivRRl/KzeP9jZrR4ADq5tAzKTT HDpLpbYTlPdc3hq/eeHCetEfqoA8n4rt9gzC5HJQ8jeKutB8RMlG77qZcqzq087OTRCc pixQ== X-Gm-Message-State: AO0yUKUL73D7pD0HCbk9fiWNtd2PAkpiJ/DlsiSxRSqrIHGY9wLfHAMP t6xbJrUDYDa+IOktbcMSisBHBx0fUTXiu3bstjodog== X-Received: by 2002:a05:600c:b46:b0:3df:deb5:6ff5 with SMTP id k6-20020a05600c0b4600b003dfdeb56ff5mr5066826wmr.24.1679493454692; Wed, 22 Mar 2023 06:57:34 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id t20-20020a1c7714000000b003ee10fb56ebsm7585361wmi.9.2023.03.22.06.57.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Mar 2023 06:57:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , Jintao Yin , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yonggang Luo , Wainer dos Santos Moschetta , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= Subject: [PATCH v2 2/2] cirrus-ci: Remove MSYS2 jobs duplicated with gitlab-ci Date: Wed, 22 Mar 2023 14:57:21 +0100 Message-Id: <20230322135721.61138-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230322135721.61138-1-philmd@linaro.org> References: <20230322135721.61138-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org - Various developers are reluctant to git Cirrus-CI the permissions requested to access their GitHub account. - When we use the cirrus-run script to trigger Cirrus-CI job from GitLab-CI, the GitLab-CI job is restricted to a 1h timeout (often not enough). - Although Cirrus-CI VMs are more powerful than GitLab-CI ones, its free plan is limited in 2 concurrent jobs. - The GitLab-CI MSYS2 jobs are a 1:1 mapping with the Cirrus-CI ones (modulo the environment caching). Reduce the maintenance burden by removing the Cirrus-CI config file, keeping the GitLab-CI jobs. Update Yonggang Luo's maintenance file list to the new file, which use the same environment shell. Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 3 +- .cirrus.yml | 111 ---------------------------------------------------- 2 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 .cirrus.yml diff --git a/MAINTAINERS b/MAINTAINERS index 9b56ccdd92..34b50b267c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3818,8 +3818,7 @@ W: https://cirrus-ci.com/github/qemu/qemu Windows Hosted Continuous Integration M: Yonggang Luo S: Maintained -F: .cirrus.yml -W: https://cirrus-ci.com/github/qemu/qemu +F: .gitlab-ci.d/windows.yml Guest Test Compilation Support M: Alex Bennée diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 5fb00da73d..0000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,111 +0,0 @@ -env: - CIRRUS_CLONE_DEPTH: 1 - -windows_msys2_task: - timeout_in: 90m - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - cpu: 8 - memory: 8G - env: - CIRRUS_SHELL: powershell - MSYS: winsymlinks:native - MSYSTEM: MINGW64 - MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe - MSYS2_FINGERPRINT: 0 - MSYS2_PACKAGES: " - diffutils git grep make pkg-config sed - mingw-w64-x86_64-python - mingw-w64-x86_64-python-sphinx - mingw-w64-x86_64-toolchain - mingw-w64-x86_64-SDL2 - mingw-w64-x86_64-SDL2_image - mingw-w64-x86_64-gtk3 - mingw-w64-x86_64-glib2 - mingw-w64-x86_64-ninja - mingw-w64-x86_64-jemalloc - mingw-w64-x86_64-lzo2 - mingw-w64-x86_64-zstd - mingw-w64-x86_64-libjpeg-turbo - mingw-w64-x86_64-pixman - mingw-w64-x86_64-libgcrypt - mingw-w64-x86_64-libpng - mingw-w64-x86_64-libssh - mingw-w64-x86_64-snappy - mingw-w64-x86_64-libusb - mingw-w64-x86_64-usbredir - mingw-w64-x86_64-libtasn1 - mingw-w64-x86_64-nettle - mingw-w64-x86_64-cyrus-sasl - mingw-w64-x86_64-curl - mingw-w64-x86_64-gnutls - mingw-w64-x86_64-libnfs - " - CHERE_INVOKING: 1 - msys2_cache: - folder: C:\tools\archive - reupload_on_changes: false - # These env variables are used to generate fingerprint to trigger the cache procedure - # If wanna to force re-populate msys2, increase MSYS2_FINGERPRINT - fingerprint_script: - - | - echo $env:CIRRUS_TASK_NAME - echo $env:MSYS2_URL - echo $env:MSYS2_FINGERPRINT - echo $env:MSYS2_PACKAGES - populate_script: - - | - md -Force C:\tools\archive\pkg - $start_time = Get-Date - bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND $env:MSYS2_URL C:\tools\archive\base.exe - Write-Output "Download time taken: $((Get-Date).Subtract($start_time))" - cd C:\tools - C:\tools\archive\base.exe -y - del -Force C:\tools\archive\base.exe - Write-Output "Base install time taken: $((Get-Date).Subtract($start_time))" - $start_time = Get-Date - - ((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-key.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C:\tools\msys64\etc\\post-install\\07-pacman-key.post - C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf" - C:\tools\msys64\usr\bin\bash.exe -lc "export" - C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Sy - echo Y | C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Suu --overwrite=* - taskkill /F /FI "MODULES eq msys-2.0.dll" - tasklist - C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true" - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu --overwrite=*" - Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))" - $start_time = Get-Date - - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed $env:MSYS2_PACKAGES" - Write-Output "Package install time taken: $((Get-Date).Subtract($start_time))" - $start_time = Get-Date - - del -Force -ErrorAction SilentlyContinue C:\tools\msys64\etc\mtab - del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\fd - del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stderr - del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdin - del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdout - del -Force -Recurse -ErrorAction SilentlyContinue C:\tools\msys64\var\cache\pacman\pkg - tar cf C:\tools\archive\msys64.tar -C C:\tools\ msys64 - - Write-Output "Package archive time taken: $((Get-Date).Subtract($start_time))" - del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64 - install_script: - - | - $start_time = Get-Date - cd C:\tools - ls C:\tools\archive\msys64.tar - tar xf C:\tools\archive\msys64.tar - Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))" - script: - - mkdir build - - cd build - - C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=python3 - --target-list-exclude=i386-softmmu,ppc64-softmmu,aarch64-softmmu,mips64-softmmu,mipsel-softmmu,sh4-softmmu" - - C:\tools\msys64\usr\bin\bash.exe -lc "make -j8" - - exit $LastExitCode - test_script: - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" - - exit $LastExitCode