From 1469e299053be4de4510cf7fd1d3f6924c902ad6 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Mon, 3 Jan 2022 09:51:56 -0600 Subject: [PATCH] tools/ci.sh: Upgrade Zephyr docker image to v0.21.0. 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 --- tools/ci.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/ci.sh b/tools/ci.sh index bf5b1fd043..5312de8a94 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -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 }