OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Move farm-disable rules before anything else

Browse Source 
For consistency, make our 'when: never' rules be the first rules to
match any job, either build or container.

Otherwise we could end up with some jobs having when: never and others
having when: manual.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25205>
This commit is contained in:
Daniel Stone
2023-09-13 13:29:06 +01:00
committed by Marge Bot
parent 3ec953ed75
commit 7cb86d9adc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@@ -156,6 +156,8 @@ include:
# When to automatically run the CI for build jobs # When to automatically run the CI for build jobs
.build-rules: .build-rules:
rules: rules:
# Don't run when disabling a farm
- !reference [.disable-farm-rules, rules]
# If any files affecting the pipeline are changed, build/test jobs run # If any files affecting the pipeline are changed, build/test jobs run
# automatically once all dependency jobs have passed # automatically once all dependency jobs have passed
- changes: &all_paths - changes: &all_paths
@@ -174,8 +176,6 @@ include:
- include/**/* - include/**/*
- src/**/* - src/**/*
when: on_success when: on_success
# Don't run when disabling a farm
- !reference [.disable-farm-rules, rules]
# Otherwise, build/test jobs won't run because no rule matched. # Otherwise, build/test jobs won't run because no rule matched.
@@ -193,6 +193,8 @@ include:
.container-rules: .container-rules:
rules: rules:
# Don't run when disabling a farm
- !reference [.disable-farm-rules, rules]
# Run pipeline by default in the main project if any CI pipeline # Run pipeline by default in the main project if any CI pipeline
# configuration files were changed, to ensure docker images are up to date # configuration files were changed, to ensure docker images are up to date
- if: *is-post-merge - if: *is-post-merge
@@ -200,8 +202,6 @@ include:
- .gitlab-ci.yml - .gitlab-ci.yml
- .gitlab-ci/**/* - .gitlab-ci/**/*
when: on_success when: on_success
# Don't run when disabling a farm
- !reference [.disable-farm-rules, rules]
# Run pipeline by default if it was triggered by Marge Bot, is for a # Run pipeline by default if it was triggered by Marge Bot, is for a
# merge request, and any files affecting the pipeline were changed # merge request, and any files affecting the pipeline were changed
- if: *is-pre-merge-for-marge - if: *is-pre-merge-for-marge