summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2023-09-13 13:36:26 +0100
committerMarge Bot <emma+marge@anholt.net>2023-09-14 05:53:47 +0000
commit16527f6ffd0129f2f6e1728e388cdc14b60240ca (patch)
tree62ecb4860481b9433e57c32a4d554c9144269095 /.gitlab-ci
parent0e1ee4fac9dfa97477f661d9b164568e695ca395 (diff)
downloadmesa-16527f6ffd0129f2f6e1728e388cdc14b60240ca.tar.gz
mesa-16527f6ffd0129f2f6e1728e388cdc14b60240ca.tar.bz2
mesa-16527f6ffd0129f2f6e1728e388cdc14b60240ca.zip
ci: Only look at file changes for MRs
Lists of files changed are only really relevant if we're pushing an MR. We don't want to trigger 'user added .ci-farms-disabled/igalia' because the user pushed a branch when this file was already present upstream. Signed-off-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25205>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/farm-rules.yml29
1 files changed, 20 insertions, 9 deletions
diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml
index 333763770bf..0f6619c9061 100644
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -242,30 +242,41 @@
.disable-farm-rules:
rules:
# changes(disabled) + exists(disabled) = disabling the farm
- - changes: [ .ci-farms-disabled/microsoft ]
+ # only run in MR context, because otherwise we get a false positive on
+ # files being 'created' when pushing to a branch, and nuke our pipeline
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/microsoft ]
exists: [ .ci-farms-disabled/microsoft ]
when: never
- - changes: [ .ci-farms-disabled/collabora ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/collabora ]
exists: [ .ci-farms-disabled/collabora ]
when: never
- - changes: [ .ci-farms-disabled/igalia ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/igalia ]
exists: [ .ci-farms-disabled/igalia ]
when: never
- - changes: [ .ci-farms-disabled/lima ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/lima ]
exists: [ .ci-farms-disabled/lima ]
when: never
- - changes: [ .ci-farms-disabled/anholt ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/anholt ]
exists: [ .ci-farms-disabled/anholt ]
when: never
- - changes: [ .ci-farms-disabled/valve-mupuf ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/valve-mupuf ]
exists: [ .ci-farms-disabled/valve-mupuf ]
when: never
- - changes: [ .ci-farms-disabled/valve-kws ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/valve-kws ]
exists: [ .ci-farms-disabled/valve-kws ]
when: never
- - changes: [ .ci-farms-disabled/austriancoder ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/austriancoder ]
exists: [ .ci-farms-disabled/austriancoder ]
when: never
- - changes: [ .ci-farms-disabled/freedreno ]
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ changes: [ .ci-farms-disabled/freedreno ]
exists: [ .ci-farms-disabled/freedreno ]
when: never