Skip to content

Commit

Permalink
tools/ci.sh: Upgrade Zephyr docker image to v0.21.0.
Browse files Browse the repository at this point in the history
As a prerequisite to upgrading to Zephyr v2.7.0, upgrade CI to use
Zephyr docker image v0.21.0. In particular, this is needed to pick up a
newer CMake version because Zephyr v2.7.0 increased the minimum CMake
version required to 3.20.0.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
  • Loading branch information
MaureenHelm authored and dpgeorge committed Jan 6, 2022
1 parent 908e4cf commit 1469e29
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tools/ci.sh
Expand Up @@ -603,15 +603,18 @@ function ci_windows_build {
########################################################################################
# ports/zephyr

ZEPHYR_DOCKER_VERSION=v0.21.0
ZEPHYR_SDK_VERSION=0.13.2

function ci_zephyr_setup {
docker pull zephyrprojectrtos/ci:v0.17.3
docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
docker run --name zephyr-ci -d -it \
-v "$(pwd)":/micropython \
-e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-0.12.4 \
-e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION} \
-e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
-e ZEPHYR_BASE=/zephyrproject/zephyr \
-w /micropython/ports/zephyr \
zephyrprojectrtos/ci:v0.17.3
zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
docker ps -a
}

Expand Down

0 comments on commit 1469e29

Please sign in to comment.