feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/dynamic_pipeline_workflow_for_tag' into 'master'

Browse Source 
ci: fix dynamic pipeline for tag pipelines

See merge request espressif/esp-idf!29370
This commit is contained in:
Fu Hanxi
2024-03-14 14:51:01 +08:00
parent a98e252595 d2b95201c3
commit 6b14ba559a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/ci/dynamic_pipelines/utils.py
View File

@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import typing as t import typing as t
import yaml import yaml
@ -22,11 +21,10 @@ def dump_jobs_to_yaml(
'tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml', 'tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml',
'.gitlab/ci/common.yml', '.gitlab/ci/common.yml',
], ],
# https://gitlab.com/gitlab-org/gitlab/-/issues/222370#note_662695503
'workflow': { 'workflow': {
'rules': [ 'rules': [
{'if': '$CI_MERGE_REQUEST_IID'}, # always run the child pipeline, if they are created
{'if': '$CI_COMMIT_BRANCH'}, {'when': 'always'},
], ],
}, },
} }