gitlab-ci: Extend .ci-run-policy template for docs jobs
authorMichel Dänzer <mdaenzer@redhat.com>
Mon, 22 Jun 2020 09:21:06 +0000 (11:21 +0200)
committerMarge Bot <eric+marge@anholt.net>
Wed, 1 Jul 2020 14:31:38 +0000 (14:31 +0000)
Requires using rules: in the pages job as well, so it doesn't inherit
the rules from the template.

v2:
* Add comment explaining that cases not covered by explicit rules
  default to "when: never".

Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5469>

.gitlab-ci.yml

index 227a27d9bb67599783ae8b36435197f41367ebce..a12b9dae01378cbac8e7c3fb1718bb62ca88a70b 100644 (file)
@@ -25,6 +25,7 @@ stages:
   - success
 
 .docs-base:
+  extends: .ci-run-policy
   image: alpine
   script:
   - apk --no-cache add py3-pip
@@ -37,12 +38,13 @@ pages:
   artifacts:
     paths:
     - public
-  only:
-    refs:
-    - master@mesa/mesa
-    changes:
-    - docs/**/*
-    - .gitlab-ci.yml
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master"'
+      changes: &docs-or-ci
+      - docs/**/*
+      - .gitlab-ci.yml
+      when: on_success
+    # Other cases default to never
 
 test-docs:
   extends: .docs-base
@@ -51,9 +53,7 @@ test-docs:
     - if: '$CI_PROJECT_NAMESPACE == "mesa"'
       when: never
     - if: '$GITLAB_USER_LOGIN == "marge-bot"'
-      changes: &docs-or-ci
-      - docs/**/*
-      - .gitlab-ci.yml
+      changes: *docs-or-ci
       when: on_success
     - changes: *docs-or-ci
       when: manual