Skip to content

Commit 11441d8

Browse files
marc-hblgirdwood
authored andcommitted
zephyr/docker-run.sh: hardcode zephyr-build img to Zephyr SDK 0.15.2
Windows has always been hardcoded to 0.15.2 in .github Actions. Fixes the compare-linux-windows check that just started to fail in daily build https://github.com/thesofproject/sof/actions/runs/4400264770 The ":latest" zephyr-build image was just upgraded to the Zephyr SDK 0.16.0-rc1 https://hub.docker.com/layers/zephyrprojectrtos/zephyr-build/latest/images/sha256-91ef9e556aa2a6b5ee5397536e6c441b87fbaef82b9dfc0d12287c39d884d0af?context=explore Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 8aab183 commit 11441d8

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

.github/workflows/sparse-zephyr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
# Caching a 12G image is unfortunately not possible:
6565
# https://github.com/ScribeMD/docker-cache/issues/304
6666
# For faster builds we would have to pay for some persistent runners.
67-
- name: docker pull zephyrproject-rtos/zephyr-build
68-
run: docker pull ghcr.io/zephyrproject-rtos/zephyr-build:latest
67+
- name: Download docker image && ls /opt/toolchains/
68+
run: cd workspace && ./sof/zephyr/docker-run.sh ls -l /opt/toolchains/
6969

7070
# We have to painfully extract REAL_CC from the docker image to
7171
# tell the Zephyr build what it... already knows and wants!! Zephyr

.github/workflows/zephyr.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ jobs:
8080
# git fetch --shallow-since='5 months ago' because Zephyr follows
8181
# a "roughly 4-month release" but for now that saves only 100MB
8282
# https://docs.zephyrproject.org/latest/project/release_process.html
83+
#
84+
# TODO: try replacing --narrow and --depth with some
85+
# --fetch-opt=--filter=?
86+
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
8387
- name: west clones
8488

8589
# Get some git tags in Zephyr. keep in sync with build-windows below
@@ -99,8 +103,8 @@ jobs:
99103
# Caching a 12G image is unfortunately not possible:
100104
# https://github.com/ScribeMD/docker-cache/issues/304
101105
# For faster builds we would have to pay for some persistent runners.
102-
- name: docker pull zephyrproject-rtos/zephyr-build
103-
run: docker pull ghcr.io/zephyrproject-rtos/zephyr-build:latest
106+
- name: Download docker image && ls /opt/toolchains/
107+
run: cd workspace && ./sof/zephyr/docker-run.sh ls -l /opt/toolchains/
104108

105109
# https://github.com/zephyrproject-rtos/docker-image
106110
# Note: env variables can be passed to the container with
@@ -160,7 +164,9 @@ jobs:
160164
path: wget-1.11.4-1-bin.zip
161165
key: ${{ runner.os }}-cache-wget-1-11-4-1
162166

163-
- name: Cache Zephyr SDK
167+
# Keep this SDK version identical to the one in
168+
# sof/zephyr/docker-run.sh
169+
- name: Cache Zephyr SDK 0.15.2
164170
id: cache-zephyr-sdk
165171
uses: actions/cache@v3.0.11
166172
with:
@@ -180,7 +186,7 @@ jobs:
180186
run: |
181187
curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip
182188
183-
- name: Download Zephyr SDK
189+
- name: Download Zephyr SDK 0.15.2
184190
if: ${{ steps.cache-zephyr-sdk.outputs.cache-hit != 'true' }}
185191
run: | # yamllint disable-line rule:line-length
186192
curl -L -O `

zephyr/docker-run.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,16 @@ main()
5454

5555
run_command()
5656
{
57+
# zephyr-build:v0.24.13 has /opt/toolchains/zephyr-sdk-0.15.2
58+
# https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags
59+
#
60+
# Keep this SDK version identical to the one in
61+
# .github/workflows/zephyr.yml#Windows
5762
docker run -i -v "$(west topdir)":/zep_workspace \
5863
--workdir /zep_workspace \
5964
$SOF_DOCKER_RUN \
6065
--env REAL_CC --env http_proxy --env https_proxy \
61-
ghcr.io/zephyrproject-rtos/zephyr-build:latest \
66+
ghcr.io/zephyrproject-rtos/zephyr-build:v0.24.13 \
6267
./sof/scripts/sudo-cwd.sh "$@"
6368
}
6469

0 commit comments

Comments
 (0)