Module: Mesa Branch: main Commit: c9de0d297743ce193010dab8ca451a353dd8299e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9de0d297743ce193010dab8ca451a353dd8299e
Author: David Heidelberg <[email protected]> Date: Sun Jul 2 22:20:05 2023 +0200 ci/microsoft: rename manual rules according to rest introduced rules Reviewed-by: Eric Engestrom <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23846> --- .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/test-source-dep.yml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 217ebd0cac8..9609ba863b5 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -437,7 +437,7 @@ debian/arm64_test: - .container - .windows-docker-vs2019 rules: - - !reference [.microsoft-farm-container-rules, rules] + - !reference [.microsoft-farm-manual-rules, rules] - !reference [.container-rules, rules] variables: GIT_STRATEGY: fetch # we do actually need the full repository though diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index a641c48079f..482497db539 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -269,16 +269,6 @@ when: on_success # Farm rules -.microsoft-farm-container-rules: - rules: - # Allow triggering jobs manually in other cases if any files affecting the - # pipeline were changed - - exists: [ .ci-farms-disabled/microsoft ] - when: never - - changes: [ .ci-farms-disabled/microsoft ] - when: manual - - !reference [.microsoft-farm-rules, rules] - .microsoft-farm-rules: rules: - exists: [ .ci-farms-disabled/microsoft ] # 1. Is disabled, never run @@ -289,6 +279,16 @@ when: never # 4. Fall-through (other rules or on_success) +.microsoft-farm-manual-rules: + rules: + # Allow triggering jobs manually in other cases if any files affecting the + # pipeline were changed + - exists: [ .ci-farms-disabled/microsoft ] + when: never + - changes: [ .ci-farms-disabled/microsoft ] + when: manual + - !reference [.microsoft-farm-rules, rules] + .collabora-farm-rules: rules: - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
