diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-02-04 08:50:45 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-19 04:42:07 +0000 |
| commit | 2d653eea9c0c70bd41cc8459885d9b0c13f2d27e (patch) | |
| tree | c4016c6bc9d2603c3bb17b5bdf5b44e3a0d930f0 /.gitlab-ci.yml | |
| parent | 88307eb2bf53f6324eb3c9a609993139880b0f7c (diff) | |
| download | chrome-ec-2d653eea9c0c70bd41cc8459885d9b0c13f2d27e.tar.gz | |
zmake: Implement zmake configure for multi-project.
Change zmake configure to work as described in go/zmake-cli-v2.
BRANCH=None
BUG=b:217788621
TEST=Various zmake configure cmds.
Cq-Include-Trybots: luci.chromeos.cq:cq-orchestrator
Cq-Depend: chromium:3462900
Change-Id: I58fa4d8427efff64c5764eac6ba4752a71785127
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3445105
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f36cc8b743..cb4e82fcba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ seed_cache: script: - zmake --zephyr-base "${ZEPHYR_BASE}" --modules-dir "${MODULES_DIR}" -l DEBUG configure -b - -B "${BUILD_DIR}/${PROJECT}" -t ${TOOLCHAIN:-zephyr} + -B "${BUILD_DIR}" -t ${TOOLCHAIN:-zephyr} "${PROJECT}" - for b in "${BUILD_DIR}/${PROJECT}"/build-* ; do bdir=$(basename ${b}) ; @@ -98,7 +98,7 @@ seed_cache: script: - zmake --zephyr-base "${ZEPHYR_BASE}" --modules-dir "${MODULES_DIR}" -l DEBUG configure -b --coverage - -B "${BUILD_DIR}/${PROJECT}" -t ${TOOLCHAIN:-zephyr} + -B "${BUILD_DIR}" -t ${TOOLCHAIN:-zephyr} "${PROJECT}" - lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/output/merged_twister.info" -a "${BUILD_DIR}/${PROJECT}/output/zephyr.info" -a "${BUILD_DIR}/zephyr_codecov/fixed.info" - lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/output/merged_twister_no_ec.info" -e "${BUILD_DIR}/${PROJECT}/output/merged_twister.info" "${ZEPHYR_BASE}/**" "${MODULES_DIR}/**" |