From 9d1d3a89c49b4afab3e6ff7fcca2ac14347d4dca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Thu, 6 Aug 2020 17:10:08 +0200
Subject: [PATCH] ci: Move test-docs job to deploy stage

We put it in the first container stage to prevent it from waiting for
jobs in previous stages, but empty needs: works for that as well.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6209>
---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b98236c..3f6e1cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ include:
   - local: '.gitlab-ci/test-source-dep.yml'
 
 stages:
-  - container+docs
+  - container
   - container-2
   - git-archive
   - deploy
@@ -97,7 +97,8 @@ test-docs:
   extends: .docs-base
   # Cancel job if a newer commit is pushed to the same branch
   interruptible: true
-  stage: container+docs
+  stage: deploy
+  needs: []
   rules:
     - *ignore_scheduled_pipelines
     - if: *is-main-master
@@ -196,7 +197,7 @@ success:
 # repository's registry will be used there as well.
 
 .container:
-  stage: container+docs
+  stage: container
   extends:
     - .ci-run-policy
   rules:
@@ -436,7 +437,7 @@ arm64_test:
   extends:
     - .container
     - .windows-docker-vs2019
-  stage: container+docs
+  stage: container
   variables:
     GIT_STRATEGY: fetch # we do actually need the full repository though
   timeout: 4h # LLVM takes ages
@@ -456,7 +457,7 @@ arm64_test:
 
 git_archive:
   extends: .fdo.container-build@alpine
-  stage: container+docs
+  stage: container
   rules:
     - if: *is-scheduled-pipeline
       when: always
-- 
2.7.4