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,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 28F38C47088 for ; Wed, 26 May 2021 21:45:35 +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 C6F4961057 for ; Wed, 26 May 2021 21:45:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6F4961057 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lm1LJ-0004hj-Uy for qemu-devel@archiver.kernel.org; Wed, 26 May 2021 17:45:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm0wj-00040x-Ix for qemu-devel@nongnu.org; Wed, 26 May 2021 17:20:09 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:36435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lm0wh-0000Sl-PT for qemu-devel@nongnu.org; Wed, 26 May 2021 17:20:09 -0400 Received: by mail-wr1-x429.google.com with SMTP id n4so2558079wrw.3 for ; Wed, 26 May 2021 14:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7R688np30I5+o18WAIciru1O5zsACw6s83EuiMLwj4I=; b=aiAd76s2gfv/wJQWAKsZcrcVEXAs6BEsxSpw7Dx7kVsOvfcd6cF5Pg91IrPd4o7g/9 3D7o2XT0TexDlAeVulcIHZKuDjJfj4nqDM3fk12Ik+E2Yd0Slrjj7PNUioZWNYCDsYG5 i9zmRE8j2ISuTzVCgyfBEuxo/8CCosQnh8F6ehcV1Z1mO5SShfC+9agzn8Goq9INIVzW C6c20iHnnJFASN9euBPwPQj1wwEPZSA8wjukjhjk63ztUr1ZCk4+gDlbjSrtuu3O5Auv 0rD6c6bxyg/ufXusS500by5ioBe2knqRGvZ506XPaKKCN/+IzMIzuTyBRWkM6pl6utHT pWcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7R688np30I5+o18WAIciru1O5zsACw6s83EuiMLwj4I=; b=glyC8ttfghlC6DzLeSaFSxp9wdoHI++dTyoKxBTP/pPTYKRg8WYA/wgFuCLnHExVBd d+kSTtMTcjniPYC6CFZ4iJYJokpMT2xsC5D1n7B2xESu9DhFITFFDFP+Te406EmjQXPp synGUWYjKrc5gmQoXyvSdraB95zEny4hiwEDg4qaQmfo9wVLfUDrmAGSh/KcFHyVryjy 7Xpn3zbwKHIWipcZ1dkd77PQG99vL7/slqu3WfJWeKhAGobK7Y6dt06Hl93wD/a9cO8X aZ9fbGHhVJxc30nBOh5+bg8OrjbDxW7uP4Tu2fF3B4rlkJjUz3XViNJvZtSpLXYuq3BT BimA== X-Gm-Message-State: AOAM5322pP/8GNhZLcCe1pONYOtvX0kbQGJZHAQSZrhL0sMNjiJY+qEn uK5HCz7NQI1/G+wSoQHgD1+PIg5cYsw8jw== X-Google-Smtp-Source: ABdhPJyNogQlTo+siy8/6uGT2zaMm7D94ch07LCuPqIQGHc9urDRe87t0I1yAcPZQJt/ouFp6+ROCw== X-Received: by 2002:a5d:598d:: with SMTP id n13mr27802wri.38.1622064006249; Wed, 26 May 2021 14:20:06 -0700 (PDT) Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id r17sm8420936wmh.25.2021.05.26.14.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:20:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master' Date: Wed, 26 May 2021 23:18:36 +0200 Message-Id: <20210526211838.421716-18-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We want to skip the checkpatch and DCO signoff jobs when pushing to the default branch. Currently this branch is called 'master', but we don't need to hardcode this in the CI configuration, because the $CI_DEFAULT_BRANCH env variable exposes it. 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é Message-Id: <20210525153826.4174157-1-philmd@redhat.com> Reviewed-by: Daniel P. Berrangé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/static_checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index f695627b7cd..9c9a771b744 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -6,7 +6,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 @@ -19,6 +19,6 @@ 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