projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ci: move test-docs to container stage
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 16bcc9ab10ac97718c8a43ed76bd83241ad727ba..42a969559ef5deb1c1c6af96b2b47023df286408 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-9,8
+9,7
@@
include:
- local: '.gitlab-ci/test-source-dep.yml'
stages:
- local: '.gitlab-ci/test-source-dep.yml'
stages:
- - deploy
- - container
+ - container+docs
- container-2
- meson-x86_64
- scons
- container-2
- meson-x86_64
- scons
@@
-22,11
+21,11
@@
stages:
- radv
- lima
- virgl
- radv
- lima
- virgl
+ - deploy
- success
.docs-base:
image: alpine
- success
.docs-base:
image: alpine
- stage: deploy
script:
- apk --no-cache add py3-pip
- pip3 install sphinx sphinx_rtd_theme
script:
- apk --no-cache add py3-pip
- pip3 install sphinx sphinx_rtd_theme
@@
-34,6
+33,7
@@
stages:
pages:
extends: .docs-base
pages:
extends: .docs-base
+ stage: deploy
artifacts:
paths:
- public
artifacts:
paths:
- public
@@
-46,6
+46,7
@@
pages:
test-docs:
extends: .docs-base
test-docs:
extends: .docs-base
+ stage: container+docs
except:
refs:
- master@mesa/mesa
except:
refs:
- master@mesa/mesa
@@
-131,7
+132,7
@@
success:
# repository's registry will be used there as well.
.container:
# repository's registry will be used there as well.
.container:
- stage: container
+ stage: container
+docs
extends:
- .ci-run-policy
rules:
extends:
- .ci-run-policy
rules:
@@
-361,7
+362,7
@@
windows_build_vs2019:
extends:
- .container
- .windows-docker-vs2019
extends:
- .container
- .windows-docker-vs2019
- stage: container
+ stage: container
+docs
variables:
GIT_STRATEGY: fetch # we do actually need the full repository though
timeout: 4h # LLVM takes ages
variables:
GIT_STRATEGY: fetch # we do actually need the full repository though
timeout: 4h # LLVM takes ages