docs/ci: merge test-docs and test-docs-mr
No reason to have two different jobs, they both do exactly the same thing with just different rules for existing. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29908>
This commit is contained in:

committed by
Marge Bot

parent
5e44b4b123
commit
d48c91c582
@@ -349,7 +349,6 @@ alpine/x86_64_build:
|
||||
rules:
|
||||
- !reference [pages, rules]
|
||||
- !reference [test-docs, rules]
|
||||
- !reference [test-docs-mr, rules]
|
||||
- !reference [linkcheck-docs, rules]
|
||||
- !reference [.container, rules]
|
||||
|
||||
|
@@ -37,18 +37,14 @@ test-docs:
|
||||
stage: deploy
|
||||
rules:
|
||||
- !reference [.no_scheduled_pipelines-rules, rules]
|
||||
- if: '$CI_COMMIT_BRANCH && $CI_PROJECT_NAMESPACE != "mesa"'
|
||||
changes: *docs-or-ci
|
||||
when: manual
|
||||
# Other cases default to never
|
||||
|
||||
test-docs-mr:
|
||||
extends:
|
||||
- test-docs
|
||||
rules:
|
||||
# pre-merge or merge pipeline
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
changes: *docs-or-ci
|
||||
when: on_success
|
||||
# fork pipeline
|
||||
- if: '$CI_COMMIT_BRANCH && $CI_PROJECT_NAMESPACE != "mesa"'
|
||||
changes: *docs-or-ci
|
||||
when: manual
|
||||
# Other cases default to never
|
||||
|
||||
linkcheck-docs:
|
||||
|
Reference in New Issue
Block a user