mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-14 07:50:25 +01:00
ci: make check-tree optional for branches other than main
Old branches tend to be formatted with a different versions of
clang-format, so when patches are backported, they introduce some
differences in formatting, making the check-tree job to fail.
These changes in formatting are normally small, and we don't pay much
attention to them, causing that the pipelines are always red, increasing
the work required to check if there are important failures or not.
Make check-tree optional for branches other than main. This way,
failures will be shown as a "warning", and if a pipeline only shows a
warning we don't need to inspect it.
(cherry picked from commit 9e47c9bc6a)
This commit is contained in:
parent
4b1e221341
commit
b497ce4372
2 changed files with 13 additions and 5 deletions
|
|
@ -60,11 +60,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-3521f7e9a13d'
|
||||
CENTOS_TAG: 'tag-291e6c0e0a5b'
|
||||
DEBIAN_TAG: 'tag-03f424f0cc55'
|
||||
FEDORA_TAG: 'tag-291e6c0e0a5b'
|
||||
UBUNTU_TAG: 'tag-03f424f0cc55'
|
||||
ALPINE_TAG: 'tag-1a1fa0d53067'
|
||||
CENTOS_TAG: 'tag-4960ce3d0698'
|
||||
DEBIAN_TAG: 'tag-e9c1178c8d3b'
|
||||
FEDORA_TAG: 'tag-4960ce3d0698'
|
||||
UBUNTU_TAG: 'tag-e9c1178c8d3b'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
@ -491,6 +491,10 @@ check-tree:
|
|||
needs:
|
||||
- "tier1:fedora:41@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
|
||||
allow_failure: true
|
||||
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
|
||||
allow_failure: true
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
stage: tier1
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -212,6 +212,10 @@ check-tree:
|
|||
needs:
|
||||
- "tier{{default_distro.tier}}:{{default_distro.name}}:{{default_distro.versions[0]}}@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
|
||||
allow_failure: true
|
||||
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
|
||||
allow_failure: true
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
stage: tier1
|
||||
script:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue