mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-26 17:00:32 +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 commit9e47c9bc6a) (cherry picked from commitb497ce4372)
This commit is contained in:
parent
a402c3517e
commit
f43af853e6
2 changed files with 17 additions and 5 deletions
|
|
@ -57,11 +57,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-b3cc86eaf091'
|
||||
CENTOS_TAG: 'tag-2d6bba92b287'
|
||||
DEBIAN_TAG: 'tag-1a37d0dc09ec'
|
||||
FEDORA_TAG: 'tag-2d6bba92b287'
|
||||
UBUNTU_TAG: 'tag-1a37d0dc09ec'
|
||||
ALPINE_TAG: 'tag-db0c946f2a8f'
|
||||
CENTOS_TAG: 'tag-8ae3df5458ca'
|
||||
DEBIAN_TAG: 'tag-6b66f9d165ff'
|
||||
FEDORA_TAG: 'tag-8ae3df5458ca'
|
||||
UBUNTU_TAG: 'tag-6b66f9d165ff'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
@ -384,6 +384,12 @@ check-tree:
|
|||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "tier1:fedora:40@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:
|
||||
- date '+%Y%m%d-%H%M%S'; clang-format --version
|
||||
|
|
|
|||
|
|
@ -205,6 +205,12 @@ check-tree:
|
|||
FDO_DISTRIBUTION_TAG: ${{default_distro.name.upper()}}_TAG
|
||||
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:
|
||||
- date '+%Y%m%d-%H%M%S'; clang-format --version
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue