mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-20 03:30:09 +01:00
ci: fix pages job
Fix the rule that triggers this job so it is run each time that a commit
is pushed/merged to main. The incorrect rule was doing that it only ran
when the *source* branch (or a MR) was called "main". Therefore, it was
(almost) never running.
Fixes: 69efb4660c ('CI: periodically clean image's registry')
This commit is contained in:
parent
384dd7d5f2
commit
ed43e4b602
2 changed files with 7 additions and 7 deletions
|
|
@ -60,11 +60,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-722dacf5c4be'
|
||||
CENTOS_TAG: 'tag-1387a813d200'
|
||||
DEBIAN_TAG: 'tag-447ddf898453'
|
||||
FEDORA_TAG: 'tag-1387a813d200'
|
||||
UBUNTU_TAG: 'tag-447ddf898453'
|
||||
ALPINE_TAG: 'tag-0c3a6f855fb8'
|
||||
CENTOS_TAG: 'tag-c1c23df75dda'
|
||||
DEBIAN_TAG: 'tag-d4bf5db9e214'
|
||||
FEDORA_TAG: 'tag-c1c23df75dda'
|
||||
UBUNTU_TAG: 'tag-d4bf5db9e214'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
@ -713,7 +713,7 @@ pages:
|
|||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == 'schedule'
|
||||
when: never
|
||||
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main'
|
||||
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
dependencies:
|
||||
- "t_fedora:42: [meson+gcc+docs+valgrind]"
|
||||
needs:
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ pages:
|
|||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == 'schedule'
|
||||
when: never
|
||||
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main'
|
||||
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
dependencies:
|
||||
- "t_{{default_distro.name}}:{{default_distro.versions[0]}}: [meson+gcc+docs+valgrind]"
|
||||
needs:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue