diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-02-14 14:51:54 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-23 03:12:57 +0000 |
| commit | e328bf3ec4768ac170a4b6d5c489f93ab1510074 (patch) | |
| tree | 44c3d1a2f6d1924bf8f2c7c66e09424e098d3465 /.gitlab-ci.yml | |
| parent | 146139588395faa002c5f8dab7f74c0f88ec06cc (diff) | |
| download | chrome-ec-e328bf3ec4768ac170a4b6d5c489f93ab1510074.tar.gz | |
zmake: Implement zmake build v2
As described in go/zmake-cli-v2
Change zmake build to call zmake configure --build.
Updated docs to stop telling people to run both configure and build as
well as some other small documentation mistakes.
BRANCH=None
BUG=b:217788621
TEST=zmake -j8 build herobrine_npcx9
zmake -j8 build test-drivers
zmake -j8 build herobrine_npcx9 test-drivers
zmake -j8 build --all
zmake -j8 build --coverage herobrine_npcx9
zmake -j8 build --coverage test-drivers
zmake -j8 build --coverage herobrine_npcx9 test-drivers
zmake -j8 build --all --coverage
zmake test build/zephyr/test-drivers/
zmake test --coverage build/zephyr/test-drivers/
zmake -j8 configure --build herobrine_npcx9
zmake -j8 configure --build test-drivers
zmake -j8 configure --build herobrine_npcx9 test-drivers
zmake -j8 configure --build --all
zmake -j8 configure --build --coverage herobrine_npcx9
zmake -j8 configure --build --coverage test-drivers
zmake -j8 configure --build --coverage herobrine_npcx9 test-drivers
zmake -j8 configure --build --all --coverage
zmake -j8 configure --test herobrine_npcx9
zmake -j8 configure --test test-drivers
zmake -j8 configure --test herobrine_npcx9 test-drivers
zmake -j8 configure --test --all
zmake -j8 configure --test --coverage herobrine_npcx9
zmake -j8 configure --test --coverage test-drivers
zmake -j8 configure --test --coverage herobrine_npcx9 test-drivers
zmake -j8 configure --test --all --coverage
Cq-Depend: chromium:3470081
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Iee939b92e39f0787e50234040a8b6b248ba6c831
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3462631
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: 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 cb4e82fcba..dbfdd52c5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ seed_cache: needs: ["seed_cache"] script: - zmake --zephyr-base "${ZEPHYR_BASE}" - --modules-dir "${MODULES_DIR}" -l DEBUG configure -b + --modules-dir "${MODULES_DIR}" -l DEBUG build -B "${BUILD_DIR}" -t ${TOOLCHAIN:-zephyr} "${PROJECT}" - for b in "${BUILD_DIR}/${PROJECT}"/build-* ; do @@ -97,7 +97,7 @@ seed_cache: needs: ["merged_coverage", "zephyr_coverage", "twister_coverage"] script: - zmake --zephyr-base "${ZEPHYR_BASE}" - --modules-dir "${MODULES_DIR}" -l DEBUG configure -b --coverage + --modules-dir "${MODULES_DIR}" -l DEBUG build --coverage -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" |