Module: Mesa Branch: main Commit: d3b6635663f71ef65230ea4a8b321a22a64a9e26 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3b6635663f71ef65230ea4a8b321a22a64a9e26
Author: David Heidelberg <[email protected]> Date: Mon Jul 3 12:47:49 2023 +0200 ci/microsoft: partly revert rename from container-rules to manual-rules We need to keep container job as a manual one, while others are always disabled. Fixes: c9de0d297743 ("ci/microsoft: rename manual rules according to rest introduced rules") Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23968> --- .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/test-source-dep.yml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 9609ba863b5..217ebd0cac8 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-manual-rules, rules] + - !reference [.microsoft-farm-container-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 d9df8faedc6..b14af7cab26 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -289,6 +289,16 @@ when: never - !reference [.microsoft-farm-rules, 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] + .collabora-farm-rules: rules: - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
