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=-20.1 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_SANE_1 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 B820AC4338F for ; Fri, 23 Jul 2021 12:46:56 +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 70E1D60E8C for ; Fri, 23 Jul 2021 12:46:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 70E1D60E8C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:49990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6uZr-00088q-HC for qemu-devel@archiver.kernel.org; Fri, 23 Jul 2021 08:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6uYe-0007DK-1h for qemu-devel@nongnu.org; Fri, 23 Jul 2021 08:45:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6uYb-00066M-56 for qemu-devel@nongnu.org; Fri, 23 Jul 2021 08:45:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627044336; h=from:from:reply-to: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: in-reply-to:in-reply-to:references:references; bh=8FJgaQqfhVCilPPdTRjVzwhoqOR5yj92xUTpwblRwCk=; b=T1i55M+KzCIpU8wIrQ93CvNuK894BcOeleYkxGVaeoUUAUCHIWs+dq9wkPaOghzY0ZMzZA r7+VhyBMNulz4987bci5yp2QZ5yZJKk/7rjjfM/vfMDwZnM0SX2Tr05LgDSUePP6QpBqMK lNTN8nLjk9qXVLVR/die6G4wBiJhO8M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-471-xhxi5_cpOJiERrUZ8Znm4w-1; Fri, 23 Jul 2021 08:45:31 -0400 X-MC-Unique: xhxi5_cpOJiERrUZ8Znm4w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 610ED1084F6B; Fri, 23 Jul 2021 12:45:24 +0000 (UTC) Received: from redhat.com (ovpn-113-197.ams2.redhat.com [10.36.113.197]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB43D3484E; Fri, 23 Jul 2021 12:45:21 +0000 (UTC) Date: Fri, 23 Jul 2021 13:45:18 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH v2] gitlab: only let pages be published from default branch Message-ID: References: <20210723113051.2792799-1-berrange@redhat.com> <7c669c1e-9c09-82b4-76e6-1b6bb6fce026@redhat.com> MIME-Version: 1.0 In-Reply-To: <7c669c1e-9c09-82b4-76e6-1b6bb6fce026@redhat.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.472, 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Willian Rampazzo , Thomas Huth , Alex =?utf-8?Q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Jul 23, 2021 at 02:41:47PM +0200, Philippe Mathieu-Daudé wrote: > On 7/23/21 1:30 PM, Daniel P. Berrangé wrote: > > GitLab will happily publish pages generated by the latest CI pipeline > > from any branch: > > > > https://docs.gitlab.com/ee/user/project/pages/introduction.html > > > > "Remember that GitLab Pages are by default branch/tag agnostic > > and their deployment relies solely on what you specify in > > .gitlab-ci.yml. You can limit the pages job with the only > > parameter, whenever a new commit is pushed to a branch used > > specifically for your pages." > > > > The current "pages" job is not limited, so it is happily publishing > > docs content from any branch/tag in qemu.git that gets pushed to. > > This means we're potentially publishing from the "staging" branch > > or worse from outdated "stable-NNN" branches > > > > This change restricts it to only publish from the default branch > > in the main repository. For contributor forks, however, we allow > > it to publish from any branch, since users will have arbitrarily > > named topic branches in flight at any time. > > > > Signed-off-by: Daniel P. Berrangé > > --- > > .gitlab-ci.d/buildtest.yml | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > > > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml > > index 89df51517c..80b57b7082 100644 > > --- a/.gitlab-ci.d/buildtest.yml > > +++ b/.gitlab-ci.d/buildtest.yml > > @@ -663,6 +663,17 @@ build-tools-and-docs-debian: > > > > # Prepare for GitLab pages deployment. Anything copied into the > > # "public" directory will be deployed to $USER.gitlab.io/$PROJECT > > +# > > +# GitLab publishes from any branch that triggers a CI pipeline > > +# > > +# For the main repo we don't want to publish from 'staging' > > +# since that content may not be pushed, nor do we wish to > > +# publish from 'stable-NNN' branches as that content is outdated. > > +# Thus we restrict to just the default branch > > +# > > +# For contributor forks we want to publish from any repo so > > +# that users can see the results of their commits, regardless > > +# of what topic branch they're currently using > > pages: > > image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest > > stage: test > > @@ -681,3 +692,10 @@ pages: > > artifacts: > > paths: > > - public > > + rules: > > + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' > > + when: on_success > > + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' > > + when: never > > + - if: '$CI_PROJECT_NAMESPACE != "qemu-project"' > > + when: on_success > > > > This is the same than: > > rules: > - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == > $CI_DEFAULT_BRANCH' > - if: '$CI_PROJECT_NAMESPACE != "qemu-project"' > - when: never > > But in your case defaults are explicit, so better. yeah, i find it confusing when the 'when:' clause is left out Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|