Skip to content

Commit

Permalink
Merge branch 'fix/dynamic_pipeline_workflow_for_tag' into 'master'
Browse files Browse the repository at this point in the history
ci: fix dynamic pipeline for tag pipelines

See merge request espressif/esp-idf!29370
  • Loading branch information
hfudev committed Mar 14, 2024
2 parents a98e252 + d2b9520 commit 6b14ba5
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions tools/ci/dynamic_pipelines/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0

import typing as t

import yaml
Expand All @@ -22,11 +21,10 @@ def dump_jobs_to_yaml(
'tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml',
'.gitlab/ci/common.yml',
],
# https://gitlab.com/gitlab-org/gitlab/-/issues/222370#note_662695503
'workflow': {
'rules': [
{'if': '$CI_MERGE_REQUEST_IID'},
{'if': '$CI_COMMIT_BRANCH'},
# always run the child pipeline, if they are created
{'when': 'always'},
],
},
}
Expand Down

0 comments on commit 6b14ba5

Please sign in to comment.