ci: fix container rules on release branches and tags

Fixes: 2487e18d4e ("ci: bare-metal: poe: Create strutured logs")
Fixes: 7c0b19a607 ("ci: run python-test automatically only in merge pipelines")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28911>
(cherry picked from commit 0666a715c7)
This commit is contained in:
Eric Engestrom 2024-04-24 23:05:42 +02:00 committed by Eric Engestrom
parent 418e19a6ff
commit 1d8901f345
2 changed files with 3 additions and 1 deletions

View file

@ -61,6 +61,8 @@ python-test:
- !reference [.never-post-merge-rules, rules]
- if: $CI_PIPELINE_SOURCE == "schedule"
when: on_success
- if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot"
when: on_success
- if: $GITLAB_USER_LOGIN == "marge-bot"
changes: &bin_ci_files
- .gitlab-ci.yml

View file

@ -354,7 +354,7 @@
"description": "ci: fix container rules on release branches and tags",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "2487e18d4e25c56a70630ccf5faf5d2081fbee2f",
"notes": null