From 11441d85409d1525de4eaede085649e3c99aa650 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Sun, 12 Mar 2023 21:04:52 -0700
Subject: [PATCH] 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>
---
 .github/workflows/sparse-zephyr.yml |  4 ++--
 .github/workflows/zephyr.yml        | 14 ++++++++++----
 zephyr/docker-run.sh                |  7 ++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml
index 46c59880615e..80eab54c4635 100644
--- a/.github/workflows/sparse-zephyr.yml
+++ b/.github/workflows/sparse-zephyr.yml
@@ -64,8 +64,8 @@ jobs:
       # Caching a 12G image is unfortunately not possible:
       #   https://github.com/ScribeMD/docker-cache/issues/304
       # For faster builds we would have to pay for some persistent runners.
-      - name: docker pull         zephyrproject-rtos/zephyr-build
-        run: docker  pull ghcr.io/zephyrproject-rtos/zephyr-build:latest
+      - name: Download docker image && ls /opt/toolchains/
+        run: cd workspace && ./sof/zephyr/docker-run.sh ls -l /opt/toolchains/
 
       # We have to painfully extract REAL_CC from the docker image to
       # tell the Zephyr build what it... already knows and wants!! Zephyr
diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index 076511562ecf..b13fa3676c15 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -80,6 +80,10 @@ jobs:
       # git fetch --shallow-since='5 months ago' because Zephyr follows
       # a "roughly 4-month release" but for now that saves only 100MB
       # https://docs.zephyrproject.org/latest/project/release_process.html
+      #
+      # TODO: try replacing --narrow and --depth with some
+      # --fetch-opt=--filter=?
+      # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
       - name: west clones
 
         # Get some git tags in Zephyr. keep in sync with build-windows below
@@ -99,8 +103,8 @@ jobs:
       # Caching a 12G image is unfortunately not possible:
       #   https://github.com/ScribeMD/docker-cache/issues/304
       # For faster builds we would have to pay for some persistent runners.
-      - name: docker pull         zephyrproject-rtos/zephyr-build
-        run: docker  pull ghcr.io/zephyrproject-rtos/zephyr-build:latest
+      - name: Download docker image && ls /opt/toolchains/
+        run: cd workspace && ./sof/zephyr/docker-run.sh ls -l /opt/toolchains/
 
       # https://github.com/zephyrproject-rtos/docker-image
       # Note: env variables can be passed to the container with
@@ -160,7 +164,9 @@ jobs:
           path: wget-1.11.4-1-bin.zip
           key: ${{ runner.os }}-cache-wget-1-11-4-1
 
-      - name: Cache Zephyr SDK
+      # Keep this SDK version identical to the one in
+      # sof/zephyr/docker-run.sh
+      - name: Cache Zephyr SDK 0.15.2
         id: cache-zephyr-sdk
         uses: actions/cache@v3.0.11
         with:
@@ -180,7 +186,7 @@ jobs:
         run: |
           curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip
 
-      - name: Download Zephyr SDK
+      - name: Download Zephyr SDK 0.15.2
         if: ${{ steps.cache-zephyr-sdk.outputs.cache-hit != 'true' }}
         run: |  # yamllint disable-line rule:line-length
           curl -L -O `
diff --git a/zephyr/docker-run.sh b/zephyr/docker-run.sh
index e1f8e63d16ed..24aedddd7385 100755
--- a/zephyr/docker-run.sh
+++ b/zephyr/docker-run.sh
@@ -54,11 +54,16 @@ main()
 
 run_command()
 {
+    # zephyr-build:v0.24.13 has /opt/toolchains/zephyr-sdk-0.15.2
+    # https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags
+    #
+    # Keep this SDK version identical to the one in
+    #    .github/workflows/zephyr.yml#Windows
     docker run -i -v "$(west topdir)":/zep_workspace \
            --workdir /zep_workspace \
            $SOF_DOCKER_RUN \
            --env REAL_CC --env http_proxy --env https_proxy \
-           ghcr.io/zephyrproject-rtos/zephyr-build:latest \
+           ghcr.io/zephyrproject-rtos/zephyr-build:v0.24.13 \
            ./sof/scripts/sudo-cwd.sh "$@"
 }