diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-11-18 21:22:56 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-02 18:59:20 +0000 |
| commit | ee4d5bdc27b7bd24c2abfb305c640b5330745f3e (patch) | |
| tree | 1149ffda9b70aedbe8abdd9b3f56415917c1fcea | |
| parent | 87e264525163f00eb98ab89446d82e41d19e98de (diff) | |
| download | chrome-ec-ee4d5bdc27b7bd24c2abfb305c640b5330745f3e.tar.gz | |
zephyr: Cut over to the main branch
Tell zmake to search for the checkout path of the main branch (see the
dependencies) instead of the v2.7 checkout path.
Update the GitLab configuration to download main instead of
chromeos-v2.7.
BUG=b:205884929
BRANCH=none
TEST=zmake testall
TEST=https://gitlab.com/zephyr-ec/ec/-/pipelines/420535963
Cq-Depend: chrome-internal:4299651
Change-Id: Ie7a2b7784606d0fc2455dab3c21ec3b49f073b06
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3310534
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1956e46e2..1f8ecfa4ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ before_script: - mkdir -p "${MODULES_DIR}" - export ZEPHYR_BASE="${CI_PROJECT_DIR}/zephyr/main" - mkdir -p "${ZEPHYR_BASE}" - - test -d "${ZEPHYR_BASE}/.git" || git clone --depth 1 -b chromeos-v2.7 https://chromium.googlesource.com/chromiumos/third_party/zephyr "${ZEPHYR_BASE}" + - test -d "${ZEPHYR_BASE}/.git" || git clone --depth 1 -b main https://chromium.googlesource.com/chromiumos/third_party/zephyr "${ZEPHYR_BASE}" - test -d "${MODULES_DIR}/cmsis" || git clone --depth 1 -b chromeos-main https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis "${MODULES_DIR}/cmsis" - test -d "${MODULES_DIR}/hal_stm32" || git clone --depth 1 -b chromeos-main https://chromium.googlesource.com/chromiumos/third_party/zephyr/hal_stm32 "${MODULES_DIR}/hal_stm32" - test -d "${MODULES_DIR}/nanopb" || git clone --depth 1 -b main https://chromium.googlesource.com/chromiumos/third_party/zephyr/nanopb "${MODULES_DIR}/nanopb" @@ -44,7 +44,7 @@ before_script: - ln -s "$(pwd)" "${MODULES_DIR}/ec" - python3 -V # Print out python version for debugging - python3 -m pip install zephyr/zmake --user - - python3 -m pip install pyyaml + - python3 -m pip install pyyaml packaging - export BUILD_DIR=build - export PATH="$PATH:$HOME/.local/bin" - export PYTHONIOENCODING=utf-8 diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 3165209a10..a68bdd050a 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -159,12 +159,7 @@ class Zmake: if zephyr_base: self.zephyr_base = zephyr_base else: - # TODO(b/205884929): Drop v2.7 from path. This is - # intentionally hard-coded here as an intermediate step to - # cutting over to the main branch. - self.zephyr_base = ( - self.checkout / "src" / "third_party" / "zephyr" / "main" / "v2.7" - ) + self.zephyr_base = self.checkout / "src" / "third_party" / "zephyr" / "main" if modules_dir: self.module_paths = zmake.modules.locate_from_directory(modules_dir) |