From nobody Fri May 17 11:29:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621957132; cv=none; d=zohomail.com; s=zohoarc; b=n5Gm9sSoqUM7bm5kpYoViSr7UrDDQoWMxQe6f33t+A4X83DolVnEtdqrHVscTBLsE1GgjdovS/pcuq/Q8dwJquw88XNJ0eFLFi101F4DaO5TzxbH05fRiqJWVE1x0mi/BYA36oQBUygrO3HOh8UEIVxdfujevgkFswvSZRYHY/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621957132; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=Vj5nfejW97Fwg5oWuXmhEqgsWECOnE2D7lKo/vxmaNE=; b=iFIO0CMl50Stn4/BWmgaQZt84mk4pBkE6TZn+IFjKXDpKwgDnA4JQZkODYMbhEApC1Dmb2NHrVW7DnVFPWmQIHBLZHqiZDxNz7yKjEYARexrMILZueuS74GMhQfJYiQJzA3HhryJbWDYlEXqH14ilzv+j2a7y9xFvRJQfcAEew4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162195713247527.768584054781627; Tue, 25 May 2021 08:38:52 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-9zUqksRBN9qs7VbF0IM4EQ-1; Tue, 25 May 2021 11:38:49 -0400 Received: by mail-wm1-f71.google.com with SMTP id v2-20020a7bcb420000b0290146b609814dso4779481wmj.0 for ; Tue, 25 May 2021 08:38:48 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id o21sm16205380wrf.91.2021.05.25.08.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 08:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621957131; 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; bh=Vj5nfejW97Fwg5oWuXmhEqgsWECOnE2D7lKo/vxmaNE=; b=FlNm3gUX5SgvddxdDsb1uKwrD+qweWOcnXgyQh7zqawOZ7NRKwiu7gqql99CGMV41Mw43q /UWpJMlUrLOayNGUiufKFgYkX6ei20ZFkyjEz5nGlg77VcaS8BgiAzbYknuwEDJT5TLDJR LhcA89R/LdgZavmtVYEEO6RSEi4WqaY= X-MC-Unique: 9zUqksRBN9qs7VbF0IM4EQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vj5nfejW97Fwg5oWuXmhEqgsWECOnE2D7lKo/vxmaNE=; b=AILAqYlBcHXZgRFFvT8fyDPvq3xdBLXCj5B1ty5fu6Vo2zAsceIArTbzhCvl+utzvn X4sxd5G1u6bQ+Q/CbHJiK8xVVvKdSCpjL4pNq9lKydV3+eOxB6shYwNu06W/7gZmDELg DOQCNiKrGeREGFDBg0d5/HYYKBDEzD402s6OZyo0dDBZuPFuH1P3YuXgKQPIwGzfgpT9 P8d+l8iE+49V/yzreoPMtzs/SkWySd3WE0qAIoTGdrpubOsVgNwlhYWXTvir+Gc7krnb Uhwym5jdHV8hcZs45tlPJ2EOJl4A34FNQHuK4VveiiDgMFLJoAFKp+y+VU1L02QJR4Go wnIQ== X-Gm-Message-State: AOAM532jaBchaQq7M7T57uTl2kEsFa1QC6OisDGG//7BHn/h0u4NWqwF Cu7C9Ss10D5Tq79NMi06Gup/twu/QQ/WhMzCN4WnTMLzPqpWau+rFPw7TJ5CvPYY7iwDQwujg44 8/IqrI6v9UOJSVQ== X-Received: by 2002:a1c:f019:: with SMTP id a25mr25249209wmb.64.1621957127896; Tue, 25 May 2021 08:38:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyw9ajOUfUDP0fjkrHO4aIY5sUc6FzhaYU5xLlf/9P7+KFn+hnPTeNnD9UrVi7/nrIQdafwGQ== X-Received: by 2002:a1c:f019:: with SMTP id a25mr25249188wmb.64.1621957127691; Tue, 25 May 2021 08:38:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Paolo Bonzini , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Savitoj Singh Subject: [PATCH] gitlab-ci: Be ready for new default 'main' branch name Date: Tue, 25 May 2021 17:38:25 +0200 Message-Id: <20210525153826.4174157-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to be ready for the GitLab changes in using inclusive terminology (replacing the 'master' branch name by the 'main' branch name), rename our use of 'master' by the $CI_DEFAULT_BRANCH environment variable, so new forks won't be facing any issue. References: - https://sfconservancy.org/news/2020/jun/23/gitbranchname/ - https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ Suggested-by: Savitoj Singh Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f718b61fa78..db4e8490483 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -784,7 +784,7 @@ check-patch: script: .gitlab-ci.d/check-patch.py except: variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' + - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 allow_failure: true @@ -797,7 +797,7 @@ check-dco: script: .gitlab-ci.d/check-dco.py except: variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' + - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 =20 --=20 2.26.3