mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 03:00:34 +03:00
Merge branch 'feat/cmakev2_ulp_legacy_shim' into 'master'
feat(ulp): build all legacy ULP projects through CMakev2 See merge request espressif/esp-idf!50143
This commit is contained in:
@@ -6,8 +6,8 @@ The buildv2 build child pipeline is generated by ``idf-ci gitlab build-child-pip
|
||||
from the same manifest as the default pipeline. This script post-processes that
|
||||
generated YAML so the cmakev2 path is exercised end to end:
|
||||
|
||||
1. Point child build jobs at the buildv2 generator artifacts, then inject
|
||||
``IDF_BUILD_V2`` so cmake activates the cmakev2 shim.
|
||||
1. Inject ``IDF_BUILD_V2`` into each child build job so cmake activates the
|
||||
cmakev2 shim.
|
||||
|
||||
2. Inject ``PIPELINE_COMMIT_SHA: ${PIPELINE_COMMIT_SHA}_buildv2`` into each child
|
||||
build job. idf-ci reads ``PIPELINE_COMMIT_SHA`` when computing the s3
|
||||
@@ -27,13 +27,6 @@ import argparse
|
||||
import yaml
|
||||
|
||||
PIPELINE_COMMIT_SHA_V2 = '${PIPELINE_COMMIT_SHA}_buildv2'
|
||||
BUILDV2_GENERATOR_JOB = 'generate_build_child_pipeline_buildv2'
|
||||
|
||||
|
||||
def _use_buildv2_generator_artifacts(job: dict) -> None:
|
||||
for need in job.get('needs', []):
|
||||
if isinstance(need, dict) and need.get('job') == 'generate_build_child_pipeline':
|
||||
need['job'] = BUILDV2_GENERATOR_JOB
|
||||
|
||||
|
||||
def patch(path: str) -> None:
|
||||
@@ -43,7 +36,6 @@ def patch(path: str) -> None:
|
||||
injected = []
|
||||
for k, v in d.items():
|
||||
if isinstance(v, dict) and 'extends' in v:
|
||||
_use_buildv2_generator_artifacts(v)
|
||||
v.setdefault('variables', {})['IDF_BUILD_V2'] = '1'
|
||||
v['variables']['PIPELINE_COMMIT_SHA'] = PIPELINE_COMMIT_SHA_V2
|
||||
injected.append(k)
|
||||
|
||||
Reference in New Issue
Block a user