From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3C23C4707F for ; Tue, 25 May 2021 16:36:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8846A61132 for ; Tue, 25 May 2021 16:36:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8846A61132 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lla2y-0004ku-Fm for qemu-devel@archiver.kernel.org; Tue, 25 May 2021 12:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llZ8y-0002nk-RE for qemu-devel@nongnu.org; Tue, 25 May 2021 11:38:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llZ8v-0008EA-N0 for qemu-devel@nongnu.org; Tue, 25 May 2021 11:38:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621957132; 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=EeCtKU1BD237PiKnx4iMyfHP8WCh+K6nI68BZhtbCLfi2SalVeYKXqZvMaUxuSPEvC/WhE 70nF4aq6DjzfBf9/IDMgYEWigAd3u61h2f1KRPkmO2RstuHqyN2ksT+Fi0O7xnRIc4Mj8X xwocqa6LIuTUfkV+PPdy3ZJ/nuwB2Pc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-HNhJMajxMryVZdmBYlKLDw-1; Tue, 25 May 2021 11:38:50 -0400 X-MC-Unique: HNhJMajxMryVZdmBYlKLDw-1 Received: by mail-wr1-f72.google.com with SMTP id x10-20020adfc18a0000b029010d83c83f2aso14720717wre.8 for ; Tue, 25 May 2021 08:38:49 -0700 (PDT) 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=oaqIRGQgb89E+PA/dJTzzZ5g5pualBwKMtYmBAYpelybE5Y0MNt/HgTBQO6dEx464o Dss/RsDBlNWJo0roAKq07IMxQFoAhm8hw2bboHSHZfHZlK6p3Cy2ddcBB7vIR+dJmGMv nUi8+3O6PfxOFKfNQKZ2bmihB3Vn6CXRqGsHfIbME80WRtZKJNQD/q7pVIMhx6vHl5mH 5rHNKxP2/1qfB/ogUA6p3kRyUXFuKCpl3gqo6AQwSzLdbBLJtiFXMCzrGZi8DHGruQi2 nTmn7yOlK2lZ+R7+6E4mw2LR3LlOZVui+Gs/Pyh6nUyELcIwbJN5osuBUPhM0Kwj6bz0 2Pyg== X-Gm-Message-State: AOAM531fzF7/aRn+vV4a6wtJ8j6Wo960mTR4T4k597qWaxG3XRbQM3qU T/zYNmq1Y09CNu9LcZ2/AREUKjcQmYNqUm9o6r32h1DCP/H5xBWW82MJXuMzRYlgTsSjH1RhUx3 IVb9FSLLvyjeWu4HmR7GJceEnfwUdyHcOjfJf8AgqCz8NFoApq3Qp6e7yZEEVx5k1 X-Received: by 2002:a1c:f019:: with SMTP id a25mr25249221wmb.64.1621957128002; Tue, 25 May 2021 08:38:48 -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) 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Savitoj Singh , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é --- .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 == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' + - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == $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 == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' + - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 -- 2.26.3