From patchwork Tue Jun 11 15:05:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 44921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5B1CC2BA15 for ; Tue, 11 Jun 2024 15:05:27 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11935.1718118323535786131 for ; Tue, 11 Jun 2024 08:05:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8855C106F for ; Tue, 11 Jun 2024 08:05:47 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A867F3F64C for ; Tue, 11 Jun 2024 08:05:22 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/6] CI: back to master Date: Tue, 11 Jun 2024 15:05:14 +0000 Message-Id: <20240611150519.1940896-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Jun 2024 15:05:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5795 Move meta-arm's CI for master branch back to master of the upstream layers. Signed-off-by: Ross Burton --- ci/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/base.yml b/ci/base.yml index 180d7c4c..9732ad04 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -7,7 +7,7 @@ distro: poky defaults: repos: - branch: scarthgap + branch: master repos: meta-arm: