From 7e39ecafd8aeb526464029d0dfc22acbf7b10a68 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 12 May 2021 11:06:52 -0700 Subject: [PATCH 1/2] zephyr/docker-build.sh: remove apt update / install libssl-dev The Zephyr image has been updated in https://github.com/zephyrproject-rtos/docker-image/pull/58 This will save some time and even better avoid llvm.org glitches like this one: https://github.com/thesofproject/sof/pull/4089/checks?check_run_id=2554961695 Signed-off-by: Marc Herbert --- zephyr/docker-build.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/zephyr/docker-build.sh b/zephyr/docker-build.sh index 80bae2cc5bf1..105eed94f34b 100755 --- a/zephyr/docker-build.sh +++ b/zephyr/docker-build.sh @@ -8,14 +8,8 @@ set -e set -x -# export http_proxy=... -# export https_proxy=... - unset ZEPHYR_BASE -sudo --preserve-env=http_proxy,https_proxy apt-get update -sudo --preserve-env=http_proxy,https_proxy apt-get -y install libssl-dev - # Make sure we're in the right place; chgrp -R below. test -e ./scripts/xtensa-build-zephyr.sh From f4805f9f7363bef5ab0092f7b0cc8864c981859d Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 12 May 2021 11:23:30 -0700 Subject: [PATCH 2/2] .github: switch docker image from ':latest' to ':v0.17.3' Even though "latest" is being referenced by the current https://github.com/zephyrproject-rtos/docker-image/tree/072880b3#readme I've been told it's too "bleeding edge" to be used in CI. v0.17.3 also has libssl-dev which was the only thing we were missing. Signed-off-by: Marc Herbert --- .github/workflows/zephyr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 281e1a5544da..e6de975e661d 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -20,5 +20,5 @@ jobs: - name: build run: docker run -v "$(pwd)":/workdir - docker.io/zephyrprojectrtos/zephyr-build:latest + docker.io/zephyrprojectrtos/zephyr-build:v0.17.3 ./zephyr/docker-build.sh