From nobody Sat Feb 7 05:26:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641820240; cv=none; d=zohomail.com; s=zohoarc; b=PliPmYZQf8TGa98VJaDwSXcQwV0GAxR6egxAGdy7DnJS860N0E1nNwHysgN0nW0zPCF7vk00YmD2oldy6C3HdIAT3MMkZki0OrjiwUWeOnKpH448NZaGk9u0H5uZ4LAkVFiXhYD9f4C09sb6wNMStmcd/3mgrjirqTns+wZ/KK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820240; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MyQw0vRvhpYAru8FNSMFrr5l9kS0HF1eFpUQdevfGzQ=; b=B9cP9+DHQx4JZ+XBkQQ4VbL4EMpF2NUdXHG0QgwfX3Z2/qjCcC7QdzpDFud6MT08R7zlVyjrWFaJMjuVN7Xrni3LN7zMfx5TBdjWGCRf8+kuAMV2hbe9FMCSvruL5WzMupTYSLRHvN3orYccLmD37V2psZctM+Jwu3lVv4WV+cs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 164182024020260.81353648134507; Mon, 10 Jan 2022 05:10:40 -0800 (PST) Received: by mail-wr1-f54.google.com with SMTP id x4so1496959wru.7 for ; Mon, 10 Jan 2022 05:10:39 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id f10sm6982246wmq.16.2022.01.10.05.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MyQw0vRvhpYAru8FNSMFrr5l9kS0HF1eFpUQdevfGzQ=; b=M882QNNLuRpiWJpL3GRKsWNZX8Nf+rt5b2TTNV51iq8S63CAzOJhxJl2mokCQkwhNE DQLL+5rmHH3xqKBwauo/dEKo2IY/KHO47srrZ5lpt8kghPQb2Iv+lmrb63E2+A/vAqkf xUdVAmpL9Y+ulARySrzw9rrhHFAF4ssaRcPUVr+c4gHctQN/Oh0nfgW+YQojjr9RdNBh carUAfYjoQa3Nc9HWMo9TXNA6QAAxXIt7VlIdODfy9qwBRbfxMfuoChvmiN07vxdcwJQ WHxCVg410a/5STmtnFHKqHAxr7GadfdSDOH8wwtsgAZiwT/GzUuOa/7ZPTYUAIbRwKhG dWew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MyQw0vRvhpYAru8FNSMFrr5l9kS0HF1eFpUQdevfGzQ=; b=iSO8KPJ9rh1AiqcqjDIkNorPkUPWw+0kdQHjnmIeK4kLasOIQVVbdG8MfXEMcd3Txw 52tLGAAhfyTTOWMeLpZ4kkj3KWPE4fc70zEI5G7n+8u6mhT5kmKlST9OKLif3sLxuo2z gvie+jvOpiIodriR4oICLYHCb9Ma3eYSCfucTliVQxkG9uP62/ryW9bVGy3zHX9BGs9c uXCEU8kaKI2UtACxS4cdockVJUCyI20rOZn+3TpsWKJf24JhInI4eDi4Qcm8XEejUbja 61AqERSTD/vRBm8zd+LpLn/I5bEUljOroZEKNKPLEqqPkFpwZecZNB6d359bkziAUKF3 xTWQ== X-Gm-Message-State: AOAM530h/jkpKiBqI26RpAXfUhBC31vIK9wqoi6dWayiPW1/4h8rxMCL k264YSLg/cX4xkyXMS1qnVE= X-Google-Smtp-Source: ABdhPJy+IxRIbBNTQz753+p3412ULp3QvjWGaDTmTMDw9rpY7KLbehlsHyRmGweqwMb2Vzq5Hz0rGg== X-Received: by 2002:a5d:42d2:: with SMTP id t18mr64394695wrr.271.1641820238426; Mon, 10 Jan 2022 05:10:38 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alexander Graf , Christian Schoenebeck , Cameron Esfahani , Roman Bolshakov , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Peter Maydell , Akihiko Odaki , Thomas Huth Subject: [RFC PATCH v3 7/7] gitlab-ci: Support macOS 12 via cirrus-run Date: Mon, 10 Jan 2022 14:10:01 +0100 Message-Id: <20220110131001.614319-8-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110131001.614319-1-f4bug@amsat.org> References: <20220110131001.614319-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641820241687100001 Add support for macOS 12 build on Cirrus-CI, similarly to commit 0e103a65ba1 ("gitlab: support for ... macOS 11 via cirrus-run"). Update the lcitool repository to get the macos12 mappings, and generate the vars file by calling 'make lcitool-refresh'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Pending on libvirt-ci MR #210: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/210 --- .gitlab-ci.d/cirrus.yml | 15 +++++++++++++++ .gitlab-ci.d/cirrus/macos-12.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-12.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index b96b22e2697..b7662959070 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -87,6 +87,21 @@ x64-macos-11-base-build: PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 =20 +x64-macos-12-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-12 + CIRRUS_VM_INSTANCE_TYPE: osx_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: monterey-base + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 + =20 # 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-12.vars b/.gitlab-ci.d/cirrus/macos-= 12.vars new file mode 100644 index 00000000000..997dbc762c8 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-12 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +CCACHE=3D'/usr/local/bin/ccache' +CPAN_PKGS=3D'Test::Harness' +CROSS_PKGS=3D'' +MAKE=3D'/usr/local/bin/gmake' +NINJA=3D'/usr/local/bin/ninja' +PACKAGING_COMMAND=3D'brew' +PIP3=3D'/usr/local/bin/pip3' +PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepox= y libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb l= ibxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config pyth= on3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo= usbredir vde vte3 zlib zstd' +PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' +PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 8f48e54238d..e91e83fed20 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 8f48e54238d28d7a427a541d6dbe56432e3c4660 +Subproject commit e91e83fed2086163013242e8a33c74fbfba7f729 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223d..6ac8b888927 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -89,6 +89,7 @@ try: generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") generate_cirrus("macos-11") + generate_cirrus("macos-12") =20 sys.exit(0) except Exception as ex: --=20 2.33.1