colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'ih/ci-check-tree-optional'

Browse Source 
ci: make check-tree optional for branches other than main

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2095
This commit is contained in:
Íñigo Huguet
2025-01-17 11:21:25 +00:00
parent 16b932c200 9e47c9bc6a
commit f7a30b3241
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@@ -60,11 +60,11 @@ variables:
#
# This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag".
ALPINE_TAG: 'tag-28624746b6b1'
CENTOS_TAG: 'tag-ca7bb4b2cd94'
DEBIAN_TAG: 'tag-37f5e32f6021'
FEDORA_TAG: 'tag-ca7bb4b2cd94'
UBUNTU_TAG: 'tag-37f5e32f6021'
ALPINE_TAG: 'tag-77ec3d923fd6'
CENTOS_TAG: 'tag-3e5d2c24e23c'
DEBIAN_TAG: 'tag-ecad19904683'
FEDORA_TAG: 'tag-3e5d2c24e23c'
UBUNTU_TAG: 'tag-ecad19904683'
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -631,6 +631,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:

4
.gitlab-ci/ci.template
View File

@@ -214,6 +214,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: