From patchwork Sun Aug 30 15:59:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1353989 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=UTADhnxO; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BfdMW5bZQz9sTK for ; Mon, 31 Aug 2020 02:00:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6D9DE2045B; Sun, 30 Aug 2020 16:00:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B-qNYx8I6YuR; Sun, 30 Aug 2020 16:00:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E43E52043E; Sun, 30 Aug 2020 16:00:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 463B51BF20F for ; Sun, 30 Aug 2020 15:59:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E65186C6D for ; Sun, 30 Aug 2020 15:59:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JI0aC-ASfhsg for ; Sun, 30 Aug 2020 15:59:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by hemlock.osuosl.org (Postfix) with ESMTPS id 08E8886A14 for ; Sun, 30 Aug 2020 15:59:57 +0000 (UTC) Received: by mail-ed1-f46.google.com with SMTP id ay8so3278341edb.8 for ; Sun, 30 Aug 2020 08:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CmWDS/RFN04+a+lyJBOxetYe908XsH069x6JINV2q7Y=; b=UTADhnxOIVQcw24xUdkqtYV4mr6DM9x0xd1totFRKYacLsyLrE6uU2DXU7rJDBd6vT GZ8X8R1ncG+hKpEMsSPoA14/IxKiww8alLn7wsL+RBfrY1Kz7dXEDZmifx5fOQSu1AEh N7h0ywMCE2HIMQRGiCXLCt5D/oI1YeGz7UCcTiMcmYBAiU1/o3odu6XRfuisIwdH6gvb qfo3V0zckWYv0YuN6j/URljqkJMmOeA7yj0LDw2nnNCa1XcWA9j0u5CReQeK5URN9+ar NWVRgnAYprqAGoW+6OVSUW4UUDTtBgm0lz8odYe+nhwodXcOoiLfjExTXeGclp+QnzRQ MvUg== 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=CmWDS/RFN04+a+lyJBOxetYe908XsH069x6JINV2q7Y=; b=i45CjRjnlDHzCWpdgU0hTuSPtEDwJVy7/uIlk2+kARs7kgRjF66hwdUpjykrZerd44 7G9sQI6ne2rDZw8uJ0iAU+PNbGbQYbnpNsmGUm9zLvraIciMzI7WjcocIbJUypGdVQs9 z84FUj/7HyTrjin7JihxRV0R/6W1Nz7PB4dQT0UAFhUATyeneF0ZiudWMTtCIOPv0aKB MOtNmjITEIA5tR/y83smfplFgvGQd3jzRiGfg5weMV0psjvaYe4rEyOWjNQYe42aFao6 MKGVvtrgOk3Zf5RP3mwb2CIY+8hJtzPg6X9N9A7RWG1vCndzVQPRkIWMFU3zqIwPEeqg Huig== X-Gm-Message-State: AOAM530RrE3jIASG/aowMr6/zrksaZzcCah4tK88/R+iix2lVqSgRJKZ BdLOwPt5V6JYu+ZSkvA3KozCRx6lDkoRcg== X-Google-Smtp-Source: ABdhPJwLty5oAx6BY9zZjn5gskcsjno5y2Q2Ndukv45Q1dyY5pqlTOUtcO7YptNbe+nRf7n6ChHXJw== X-Received: by 2002:a05:6402:1299:: with SMTP id w25mr7853362edv.349.1598803195744; Sun, 30 Aug 2020 08:59:55 -0700 (PDT) Received: from arnoutx1.fritz.box ([77.109.89.170]) by smtp.gmail.com with ESMTPSA id dk28sm5292615edb.90.2020.08.30.08.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 08:59:55 -0700 (PDT) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Sun, 30 Aug 2020 17:59:53 +0200 Message-Id: <20200830155953.1650346-1-arnout@mind.be> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] support/misc/gitlab-ci.yml.in: include Branches workflow X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Recently, gitlab-ci has gained a lot more flexibility in when pipelines are created. As a side-effect of this, double pipelines may be created when a `when` clause is used in some job. Avoid this by adding a workflow that launches it only on branches. See [1] and [2]. Note that in reality, the duplicate pipelines only occur for merge requests. Since we don't have merge requests, we don't have this problem. Howver, gitlab also displays an annoying error message on the pipeline page [3], and it sends an error mail to the triggerer (i.e., Arnout), so it's still useful to do this. [1] https://docs.gitlab.com/ee/ci/yaml/README.html#prevent-duplicate-pipelines [2] https://docs.gitlab.com/ee/ci/yaml/README.html#workflowrules-templates [3] https://gitlab.com/buildroot.org/buildroot/-/pipelines/183589361/builds Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- I'd like to get this one in master, because the e-mails are annoying me :-) --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index dddebf09e9..8a031898ef 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,6 +1,9 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines +include: + - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml' + image: buildroot/base:20200814.2228 .check_base: