From nobody Mon Feb 9 11:30:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1635312427; cv=none; d=zohomail.com; s=zohoarc; b=Pz2uIarRnfKN7KQqdB8os9XCtBx3VwuaKjyacXqaUzCA4PWwgHufvXvBW+uyoepPmjzfzKwOqmb9Pzif+2U+go0gBxrGijXCYRjEfpQW4cq2i+ZM8QRqmeE+rY1QGPmAAPNlsKNyldjXw7a/FKdFOVY6IB2Na+/fmeaBnBp/TZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635312427; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=nhkz4fhSYwpACOwd0W4U78Tq1lX+yesCuM2UP3c4jwk=; b=cc5Zz3x4+gBu5bLEcBxTEvBzqxRKLITWs2YdBfqOJHEJntbhO+mlT9SFI4kWabOp9TPrYEZ5RhfG5EWglAd/pitqCa69lN+pv+vbXmHGgniUJnoQG+wssPOnExkrkVwufIIk91wvC0qDnUpcdCZQBFRBkjonlKlqbODrXSxewRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635312427733254.13490505995958; Tue, 26 Oct 2021 22:27:07 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-URy0YAeeOvGP0JL-oqw3Ng-1; Wed, 27 Oct 2021 01:27:04 -0400 Received: by mail-wm1-f70.google.com with SMTP id z137-20020a1c7e8f000000b0030cd1800d86so741349wmc.2 for ; Tue, 26 Oct 2021 22:27:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id b7sm1778585wrv.72.2021.10.26.22.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 22:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635312426; 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: in-reply-to:in-reply-to:references:references; bh=nhkz4fhSYwpACOwd0W4U78Tq1lX+yesCuM2UP3c4jwk=; b=EKhyKNGO/6aOQz4+fpkAKce9JsEaETe4vmEIxGWpglrmLBJP4JpbrCWfP4PrzwXrpOUkFx nIP/q+O1MIitg55CQKSAn/YZc6yjQbe/vJqNKF+4+bWiFWoWEnBpeD8J7VcR4I6CTxb3Uu Tprtye/5ECkMVJ2wbozxlhJAMK8ywUs= X-MC-Unique: URy0YAeeOvGP0JL-oqw3Ng-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nhkz4fhSYwpACOwd0W4U78Tq1lX+yesCuM2UP3c4jwk=; b=g2D18EcGo7XHko/7fUfp5eaQOmdSf2rYtwnq9wxPR0GkGYqUdxwZ7AD7KXhY8XuuIv WM6gFoX/KaF6Vc/RqLjM5miGLD7aZMGw1NRQXgAfWvWZK6iAhtirirc0OPZAUEvwh0rL 8ZJY93SF9y9kw2S0hMtAF7r1/dzNKAAhULbOyPnf2Vnr6kOWFOoYLy4HAZzezQyyU6SE sYXoPa0uaGcoIJg9ZwUeUiHP+ucFSHMRDURTRJJg7tw9K32NhvWARSCaKHoUR8+A4wPm FG39SznsL9UNnbYluTwqKIvk8zsg3Aj2XP0VBFBRBQ8hgrU+2kypyLCngQy9DpWxE3Za LT0g== X-Gm-Message-State: AOAM530p8U5Th+EynmE+lMZ42Q+lNMLP7k8QedwLr5Xa4KjAEISAmlR0 IvFI5sAipe9l7qqQJDD8CU7N8ws2L7mju1LVT8GIME0bLZDm9PqBExk1Qr6mSAyc+EIQ6dPirpA pqjJ1ZTPq1T9/iw== X-Received: by 2002:a05:600c:255:: with SMTP id 21mr3578286wmj.54.1635312422825; Tue, 26 Oct 2021 22:27:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYouRo95jaHSafAznfs31z7vFbfFJVA2j70VDMYNUNRZN0TqaPJK4xf8+PwcPpBm4PnYbXaA== X-Received: by 2002:a05:600c:255:: with SMTP id 21mr3578275wmj.54.1635312422675; Tue, 26 Oct 2021 22:27:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Michael Roth , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH-for-6.0.1 1/2] gitlab: only let pages be published from default branch Date: Wed, 27 Oct 2021 07:26:55 +0200 Message-Id: <20211027052656.1275436-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027052656.1275436-1-philmd@redhat.com> References: <20211027052656.1275436-1-philmd@redhat.com> 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) X-ZM-MESSAGEID: 1635312429834100001 From: Daniel P. Berrang=C3=A9 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=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210723113051.2792799-1-berrange@redhat.com> Signed-off-by: Paolo Bonzini (cherry picked from commit eafadbbbac06a8d72baa976f4d3c42b0e5f8cfc8) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d65d6c04f..f8cc67baad9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -817,6 +817,17 @@ build-tools-and-docs-debian: =20 # 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 @@ -835,3 +846,10 @@ pages: artifacts: paths: - public + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D=3D $CI_DEFAULT_BRANCH' + when: on_success + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' + when: never + - if: '$CI_PROJECT_NAMESPACE !=3D "qemu-project"' + when: on_success --=20 2.31.1