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>
This commit is contained in:
Michel Dänzer 2020-08-06 17:10:08 +02:00 committed by Marge Bot
parent 549ae5f843
commit 9d1d3a89c4
1 changed files with 6 additions and 5 deletions

View File

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