From f8cc3d8468088b0cb3b993623ddcb388e26dac60 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 27 Sep 2021 06:20:45 +0000 Subject: [PATCH] .github/zephyr: point at the latest zephyr container again Also stop hardcoding the SDK version number: Zephyr's CMake can automatically find the latest SDK in the home directory but not in /opt/toolchains so add some symbolic links. Fixes the build broken since https://github.com/zephyrproject-rtos/zephyr/pull/38733 Signed-off-by: Marc Herbert --- .github/workflows/zephyr.yml | 3 +-- zephyr/docker-build.sh | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index f30c05d256e3..60a7b853934c 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -17,6 +17,5 @@ jobs: - name: build run: docker run -v "$(pwd)":/workdir - -e ZEPHYR_SDK_INSTALL_DIR='/opt/toolchains/zephyr-sdk-0.13.0' - docker.io/zephyrprojectrtos/zephyr-build:v0.18.3 + docker.io/zephyrprojectrtos/zephyr-build:latest ./zephyr/docker-build.sh -- -DEXTRA_CFLAGS='-Werror' diff --git a/zephyr/docker-build.sh b/zephyr/docker-build.sh index 757c66e7724f..e0b094f2f6f2 100755 --- a/zephyr/docker-build.sh +++ b/zephyr/docker-build.sh @@ -18,6 +18,10 @@ test -e ./scripts/xtensa-build-zephyr.sh sudo apt-get update sudo apt-get -y install tree +ls -ld /opt/toolchains/zephyr-sdk-* +# Zephyr's CMake does not look in /opt +ln -s /opt/toolchains/zephyr-sdk-0.13.* ~/ + if test -e zephyrproject; then ./scripts/xtensa-build-zephyr.sh -a "$@" else