From patchwork Sat Nov 11 15:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 743088 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp819326wrw; Sat, 11 Nov 2023 07:30:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IHOcRpExk3qzyYg6SXypl5D0Cj7ncvZ4qZLD407UWPWrCVZRNCTp6P0Qcf5qsqcdXO6FRZD X-Received: by 2002:a05:622a:1748:b0:41e:172f:6e78 with SMTP id l8-20020a05622a174800b0041e172f6e78mr2809483qtk.29.1699716634830; Sat, 11 Nov 2023 07:30:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699716634; cv=none; d=google.com; s=arc-20160816; b=kBcL4YZQ+D4rUyMHcChrdTrS4Z0v9HnnCYbFx45j7foI9eB1B6cYdb0XTUY0J/4Ibs cIZr+HX7ojxCy7UQMU7jGLsDfgBAvVTfZnHxDT7q5VzfA+8MUvpL7psUMRrXnJaPyZkh NBlPo8amegtMQlqWjV/ZWHcpsS4EIToriuBEYz8kVFW+D3gSsa0mhY2YCBZ9gGDPwK1N RfETVYbo2QCvVd99t+oVDRhslJwmIzlo/l0Zs7VIvtbdj1qzY3AcplwUyl5zZv5pKsMM fuFqdKUWJffJppN3Bi3ibN88uLJpUrxPhFY1z6gb5pCfDrMwyEyHjDR5c10jSn5ZVKEz lJXw== 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=qmUReIKnCgHwKeQ8mgDCHmJ5OYZe6yUipuBRHMuoC1E=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=qjHvAEw85RUIxSXWwRiOSXzqjbGuAi7jWGEjdtsMOWTnq01h/2f1iU1xOxtWHBGu4Z Uo+esXC/PJAHWxXxPzKhQJOtYSCNGJpMzw3OiyWDNlOL7H9uO+NDFNIjpYFu7zeN51F3 i4MkjBsdkL7W7Wpn+N3fHLoZ/1Kyk+6irVCxQb2hf7vaRQdLUQAY3322NqCmZFfoDKCB agkcxEnzSOUs6qSCo/aXXSz5ibz7pRI3hkiXQcJMj8dejyyQ7mAefT/aNJqLG4U+xes7 x29wzmVn2dyTgNQAQsrwexlS8uLjW4GCv7UxUnaZSNv7VqdutPHDm4oanF1xceGqfpFO JAtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JkY35ev2; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r13-20020ac85c8d000000b00419ab6ffee0si1478599qta.235.2023.11.11.07.30.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Nov 2023 07:30:34 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=JkY35ev2; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pva-0003tB-PO; Sat, 11 Nov 2023 10:29:42 -0500 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 1r1pvZ-0003p4-Ca for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1pvW-0008Ju-Ez for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716578; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qmUReIKnCgHwKeQ8mgDCHmJ5OYZe6yUipuBRHMuoC1E=; b=JkY35ev2ageL2WzANa6dOoZ9p8dJKMlBNjntFugAsZZyGu1YvMex7Ww+BYWM+uJYa12vuV EFGYuYIuR66ePcc9SFDZHrcfHtTqimB8Iqg8jK2DCZdXI8zRmpqK6kV1BAvtQy60SKs3pt T88Y6wdhNKDMTpzZjXPCtvgfVbxLNPU= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-STAzA1yXMlGnw_cpC5_zOA-1; Sat, 11 Nov 2023 10:29:36 -0500 X-MC-Unique: STAzA1yXMlGnw_cpC5_zOA-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9e61e969b19so115130766b.2 for ; Sat, 11 Nov 2023 07:29:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716574; x=1700321374; 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=qmUReIKnCgHwKeQ8mgDCHmJ5OYZe6yUipuBRHMuoC1E=; b=mWUso/krv32f0ZvU83lU6eOygKtif8sSU79FKbd0zkxbwzgj9GOvN4OJdOGT2QtE+X iENehxqHYje/nO/WX33k2fhsVLv5iWJb+PZxEVN79YicQD0U5qzZZY5ClJvqJ602BqxA +RYzKrgmTw8wGU2Nn8yvj1gfVIRwINgMAIWahLAQd3DmnmKOX+SvQWouFt8xeFM5i+2j xjCGdsurIe4VKDkZAFbw3AQzGa46fR+kR2TfpzsN74jzA3C0g2qcHCbzIYwx6e7XhDIW 8OQrfuiuCm3K6a0nkYd+kBMxfwTGNFEd1ZSDPDfH4bRLq47cEyhmVIKzvedn+x+83Ux4 cv7w== X-Gm-Message-State: AOJu0YzDTmy/8ByOleQGONTDJSUZwl53IsJtWbZxauHUjBoJh4GfllST 3+syvzZiB0Gh9ZebPWbxPHD40/Nz4dE49qjT0aOh/J4shd4GP7P8pSrgF76J2/2Ho4P7x+QnVzb WtJOnTiKHqtxeCN1zZQ4PReZHMJPaDyXhWGVXshlHSXZ/1cJauHdwneRUzWXtv/3DM3g2w5LhV0 E= X-Received: by 2002:a05:6402:6c3:b0:543:4fdb:de84 with SMTP id n3-20020a05640206c300b005434fdbde84mr1755354edy.7.1699716574704; Sat, 11 Nov 2023 07:29:34 -0800 (PST) X-Received: by 2002:a05:6402:6c3:b0:543:4fdb:de84 with SMTP id n3-20020a05640206c300b005434fdbde84mr1755344edy.7.1699716574430; Sat, 11 Nov 2023 07:29:34 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id p19-20020aa7d313000000b0053deb97e8e6sm1095621edq.28.2023.11.11.07.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 4/6] buildsys: Bump known good meson version to v1.2.3 Date: Sat, 11 Nov 2023 16:29:21 +0100 Message-ID: <20231111152923.966998-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé We need meson v1.2.3 to build QEMU on macOS Sonoma. It also builds fine all our CI jobs (as tested by also bumping "accepted" in pythondeps.toml), so let's use it as our "good enough" packaged wheel. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1939 Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231109160504.93677-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- python/scripts/vendor.py | 4 ++-- python/wheels/meson-0.63.3-py3-none-any.whl | Bin 926526 -> 0 bytes python/wheels/meson-1.2.3-py3-none-any.whl | Bin 0 -> 964928 bytes pythondeps.toml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 python/wheels/meson-0.63.3-py3-none-any.whl create mode 100644 python/wheels/meson-1.2.3-py3-none-any.whl diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 76274871170..1038b14ae0c 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() packages = { - "meson==0.63.3": - "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a", + "meson==1.2.3": + "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", "tomli==2.0.1": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", diff --git a/python/wheels/meson-0.63.3-py3-none-any.whl b/python/wheels/meson-0.63.3-py3-none-any.whl deleted file mode 100644 index 8a191e3a200eba6783297676729ec85ceb96f89d..0000000000000000000000000000000000000000 Binary files a/python/wheels/meson-0.63.3-py3-none-any.whl and /dev/null differ diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..a8b84e5f114ad3fbec8ae56008426a90bccfc168 GIT binary patch Binary files /dev/null and b/python/wheels/meson-1.2.3-py3-none-any.whl differ diff --git a/pythondeps.toml b/pythondeps.toml index 4beadfd96f5..0e884159993 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ [meson] # The install key should match the version in python/wheels/ -meson = { accepted = ">=0.63.0", installed = "0.63.3", canary = "meson" } +meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } [docs] sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" } From patchwork Sat Nov 11 15:29:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 743089 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp819493wrw; Sat, 11 Nov 2023 07:30:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZLLtfOqhfg1hjSF2Mch70sZUeo5oX0Q156/3x/KT7ETuRj7D6YAiFSWDIQikFd0koibzp X-Received: by 2002:a05:620a:4551:b0:76f:2899:3a96 with SMTP id u17-20020a05620a455100b0076f28993a96mr3396471qkp.0.1699716652427; Sat, 11 Nov 2023 07:30:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699716652; cv=none; d=google.com; s=arc-20160816; b=UVuz2iiYyfZtq91jJt7DKwXT38jT52jjlnAxvqvoUpfeoMyFUbRNgmLQTW7ww36jIA yBdKxRZn48p4qDGlbq0Rb3OzlI1QfFpdEeObTVhhEsS4O3EvphB++iuMiQft+WTeEH+y TyUC8mOnsy7SCvH3wHN+s1U3GQipniq2rJ57tnPGHk4jKYLfc4r5hePBuI5MNQ8Qwncf cFgD6VABPPZBKS6RWZeulGAckLs69pNbfKR4XBr5ImdjCpTs3eiDi1RHT5PwOetU9GYV 43V02G0oFmvgUNlENvKdGszL2yE4M7ALIuxkSidll9/nuzcCOfPErxRjyBs1lq6TuYMr 9+jA== 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=Hl4FPp2TiWf73lYkGpagrM0g80ds/eBjfxzWE9bvrYM=; fh=iBCV4w7YK1vyHYfwyxOoXBCd3sIBF9+yH+94qSO9meY=; b=fGr+5pH1kcDt0kM5qfyt/90kGiubzi38D1te+iANg3eTMH9tNfyCtk9xNFJeh+D05z Jy5OHwesZYD/db2WX8fwljU1Yi0F824Opzw2pxj1tCpwqVTwVJfQp9lzji7mAN4KJDWq 55wEPnr798MZuRIB2T/N5JVrH6WUX/1OtHfc1bbA1y0TSXqFqXbjRRg50Tt+NZDpYELc 7hSo5B6jErKIiEPKQQqLz2tQp7no53OMaNJInN+IrIhpK0GmgBcIKuRimkTp7xFD0Xiz ox6xsWfbuQV/sOzYsDAh5vRw3Yd3qZ9DWswnVlCS5ql5QAIOnkh9b083h982gydceSaM 9Y1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HpV9XTRM; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bp13-20020a05620a458d00b0076cb6c9e0a6si1592397qkb.336.2023.11.11.07.30.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Nov 2023 07:30:52 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=HpV9XTRM; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pvc-0003yJ-E5; Sat, 11 Nov 2023 10:29:44 -0500 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 1r1pva-0003u3-VH for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1pvZ-0008K8-29 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716580; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hl4FPp2TiWf73lYkGpagrM0g80ds/eBjfxzWE9bvrYM=; b=HpV9XTRMICeHtPm6QQLjK6NYOx3mM8Lojh8jmhXHWNN6rIUyNlLdGBbqYYz3ggXjggnghk 1f1jxccEoObgXg4MIcjJL/cRSwtX61M+3LJ3AMYv+2vgHeVEOLGFINFq2siyVllukm1r1D EtXk3jhoBZTO+6vZhlvfvIFNtBKMgA4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-TXfbByv-Py6agoEX0wp_2w-1; Sat, 11 Nov 2023 10:29:38 -0500 X-MC-Unique: TXfbByv-Py6agoEX0wp_2w-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9dd489c98e7so218416866b.2 for ; Sat, 11 Nov 2023 07:29:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716577; x=1700321377; 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=Hl4FPp2TiWf73lYkGpagrM0g80ds/eBjfxzWE9bvrYM=; b=aZi+aP3f+4TgWxbcSZO/bAHEUvg4IEU8ev4sF4vizAG0zmy6fCGxPefbxwItaoQvaz K2oYDgZwHE/RUl1s8eQZEP6i6l1eUl8S0519CloN8bXKxY6kqopgdR/6tOgmDpF9Lcre A7cOH6Rwq7s2U8xf7rWcqug6yDG5GvhJ9GKZzKgZGBr2sjQLJxPOfT8muIdF+eFCt8Qx mNh+po7jtG7902TVRCDovN6GDNQn5Cwb83NzouUlrVu9VPtpAAdDAoXf+2C7Cdw/6DxB 9rBcnU/2tXhJANjxIWAmEJjQkOQZIm20ZfjfWyJM8b4k6sC/njgtPc12VfyxVXcZqtku LoxQ== X-Gm-Message-State: AOJu0YyQhpBhEeG/gC2NhvOZwhLX90zymvJIGXr/bn6/dK7iVoQLspLz UyaRD/qgwrtvhTxYRU3D4SWw58wtbINjis8FwqTgt5tdOPg/BlK9CdtJ7THWjzrkkVQhhw+WSOI jEgXtBbxwKmjqdXwliRposfL/7OwyGN6ThpJiE5zC3FO4gWihZS1m1sENI23nC9s32aQOJjnl5M w= X-Received: by 2002:a17:906:140d:b0:9bf:2f84:5de7 with SMTP id p13-20020a170906140d00b009bf2f845de7mr1599696ejc.4.1699716576954; Sat, 11 Nov 2023 07:29:36 -0800 (PST) X-Received: by 2002:a17:906:140d:b0:9bf:2f84:5de7 with SMTP id p13-20020a170906140d00b009bf2f845de7mr1599684ejc.4.1699716576701; Sat, 11 Nov 2023 07:29:36 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id lg7-20020a170906f88700b00977eec7b7e8sm1209901ejb.68.2023.11.11.07.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 5/6] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) Date: Sat, 11 Nov 2023 16:29:22 +0100 Message-ID: <20231111152923.966998-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé macOS 14 "Sonoma" was released on September 2023 [1]. According to QEMU's support policy, we stop supporting the previous major release two years after the the new major release has been published. Replace the macOS 12 (Monterey) testing by macOS 13 (Ventura, released on October 2022, [2]). Refresh the generated files by running: $ make lcitool-refresh [1] https://www.apple.com/newsroom/2023/09/macos-sonoma-is-available-today/ [2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-ID: <20231108162022.76189-1-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus.yml | 6 +++--- .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} | 2 +- tests/lcitool/refresh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} (95%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index e7f1f83c2c4..07dc6edae1c 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -59,13 +59,13 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check -aarch64-macos-12-base-build: +aarch64-macos-13-base-build: extends: .cirrus_build_job variables: - NAME: macos-12 + NAME: macos-13 CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-13.vars similarity index 95% rename from .gitlab-ci.d/cirrus/macos-12.vars rename to .gitlab-ci.d/cirrus/macos-13.vars index 5f3fb346d1d..534f0299560 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-13.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-12 qemu +# $ lcitool variables macos-13 qemu # # https://gitlab.com/libvirt/libvirt-ci diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 92e7d30982e..2259f131b48 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -196,7 +196,7 @@ try: # Cirrus packages lists for GitLab # generate_cirrus("freebsd-13") - generate_cirrus("macos-12") + generate_cirrus("macos-13") # # VM packages lists From patchwork Sat Nov 11 15:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 743087 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp819069wrw; Sat, 11 Nov 2023 07:30:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGa6g8JeSNk0IF0SSSxPgar4lGasElr2G6zJAPq/hh3oMEuPh4WTK3osBlkGqpWSOc0r4oh X-Received: by 2002:a05:6902:1541:b0:da0:caba:9017 with SMTP id r1-20020a056902154100b00da0caba9017mr2559814ybu.16.1699716604846; Sat, 11 Nov 2023 07:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699716604; cv=none; d=google.com; s=arc-20160816; b=Y1JqhxRpdEWdFtuzl9s4lW1XeJuTTqPJjbaFZbRC8YS/eQSTfAbo0ALtej638kGMuv cujR5hSaUXXY3O8I6hffTSv1nj1KgTzp+9PxaAZueor7dlkE8dJXek4wfYBszuAHvl5J 5vCVI8SQHzw15VwVE+qUxYbkk54VsFZExk1vrxADorIDql09stctPUNqtsKnqCsCVPL5 RenvPYaMdyLf4goqJY67X1NOThh07R3u+ZcMn9k4CK/3XEyTB4tNb1t/pAojcnrnEBll AFcxluuJ6LqhA0xnLD4tkjrYrhGyGKqV6BE0mCg3nAJ+s6ZhxmZZxiTpeomDQDAtfRm4 XzsA== 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=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=Y5w5SgEzxUtgg8QAc9iRnCtbqdBvFuJk16eCR6n/9Non1BdS6rLmj2bF+8GrQ5HIpl TxxZRDzOeSB85BsGuYyx1ld2Oh3ejRo+zkAmTFANI8BWg0TB67N1IwvS1Cz4v7izjlVR v3wI/4QjZw9UDppNJY/+VYLcYDK48zcc1V20/th/aHdZ5nmNXYcprHb06b/dNXKfHUD8 I7dgOAqgZt2+QKK4b0HR2jb1NceWpyuALVvb1CJSyL8nfmekC0ZMnfVRZHlhdnOY1PTz Is2S0vb7vGJVWleEsHl3JhlT+hs3qh3z7KJqnHoY5kiMxeaig2RT7nZz8CQMOXiZu/1l bzsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e3sk4AAf; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i10-20020a056214020a00b0066d02306e80si1633174qvt.184.2023.11.11.07.30.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Nov 2023 07:30:04 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=e3sk4AAf; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pve-0003yf-39; Sat, 11 Nov 2023 10:29:46 -0500 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 1r1pvd-0003yS-A9 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1pvb-0008KO-I7 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716582; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; b=e3sk4AAf0elZQjLXOpTQWH+IEvaXjjnePH9mfUeXhMhQyIi04rlhEgp5avqIkK3yGGaRu3 WO6ZQwd48XKHViBkCEp5ovrW2cPHblHemI/QbQCMUSOp83kdUoGdNWeI0kUFbxLVnr0QTH 1SGG+dA7y/UIyqNNmEhxBeHhqwqBgI4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-agDX8IXDM5KOylrViluFRA-1; Sat, 11 Nov 2023 10:29:41 -0500 X-MC-Unique: agDX8IXDM5KOylrViluFRA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9e293cd8269so227221266b.0 for ; Sat, 11 Nov 2023 07:29:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716579; x=1700321379; 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=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; b=fD3GLLQ4/N/iQRG8hfyMHKYNxLF6i6j7tYjhR54dhtCKn9SvmKbkXTtaN/dqei5ZWZ I4DArwfcmvDOmUZOGL5rraU2tcgM0kj7QIHFpXCaOIVyQvvCIKxIGIT8N/q/1w3xkIQT GHm8LkMImWsXlpa816nzTeoY4SeM+Hc3GgkPtjjArXNwDosa/Vtr6TKC9Z7sLkBzv5MF OYkoCUADKEVOu+UEFXLLfqPOI7ay2BzJY72Cz/xtfkCkT2hHDV6y8uWjJXy8Msl+H7uh 1Q5hUPBHzcVTWnlACA9jArAKECoprpsf6cmVosQh/+XnBFLNyyzoEj9iJ6ryf/j5uLm5 4doQ== X-Gm-Message-State: AOJu0YwkVRFAjvkU51tUyL5zSxzL5m8HtHKgBnqbLGrvDDQHFpQHSnv2 S6P0SB294uk64wH1v1Xri9iy4BH1pwdek41WwKylWLNMAZJezx84701DEVPqAtAj73sP3Yfh+q8 m5lfZAdPWNVd3IsC+8gRyJuc/DG9kfjhiAETuWuBn41YR69hbP4gltWW9E/rnGkCbcWSuH7YJ2T k= X-Received: by 2002:a17:906:4147:b0:9e6:59d5:71c4 with SMTP id l7-20020a170906414700b009e659d571c4mr1412389ejk.16.1699716579461; Sat, 11 Nov 2023 07:29:39 -0800 (PST) X-Received: by 2002:a17:906:4147:b0:9e6:59d5:71c4 with SMTP id l7-20020a170906414700b009e659d571c4mr1412378ejk.16.1699716579127; Sat, 11 Nov 2023 07:29:39 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l22-20020a170906a41600b0099d798a6bb5sm1209620ejz.67.2023.11.11.07.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 6/6] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Date: Sat, 11 Nov 2023 16:29:23 +0100 Message-ID: <20231111152923.966998-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé Upgrade libvirt-ci so it covers macOS 14. Add a manual entry (QEMU_JOB_OPTIONAL: 1) to test on Sonoma release. Refresh the lci-tool generated files. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231109160504.93677-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus.yml | 16 ++++++++++++++++ .gitlab-ci.d/cirrus/macos-14.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-14.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 07dc6edae1c..64f2e25afab 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -74,6 +74,22 @@ aarch64-macos-13-base-build: PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 +aarch64-macos-14-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-14 + CIRRUS_VM_INSTANCE_TYPE: macos_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 + QEMU_JOB_OPTIONAL: 1 + # The following jobs run VM-based tests via KVM on a Linux-based Cirrus-CI job .cirrus_kvm_job: diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-14.vars new file mode 100644 index 00000000000..43070f4a265 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-14.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-14 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +CCACHE='/opt/homebrew/bin/ccache' +CPAN_PKGS='' +CROSS_PKGS='' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' +PACKAGING_COMMAND='brew' +PIP3='/opt/homebrew/bin/pip3' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' +PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 36bc517161c..77c800186f3 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 36bc517161c45ead20224d47f2dc4fa428af6724 +Subproject commit 77c800186f34b21be7660750577cc5582a914deb diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 2259f131b48..e11d0ba381f 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -197,6 +197,7 @@ try: # generate_cirrus("freebsd-13") generate_cirrus("macos-13") + generate_cirrus("macos-14") # # VM packages lists