From e9b2e087acb3e08a52290a51610759c330bd7c63 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Wed, 13 Dec 2023 15:46:57 +0200 Subject: [PATCH 1/2] workflows: Upgrade docker container to v0.26.6 This brings in Zephyr SDK 0.16.4 containing toolchain for imx8ulp. Signed-off-by: Daniel Baluta --- zephyr/docker-run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zephyr/docker-run.sh b/zephyr/docker-run.sh index bf1c37a46cdc..5fa229e2ce30 100755 --- a/zephyr/docker-run.sh +++ b/zephyr/docker-run.sh @@ -18,10 +18,10 @@ # use this script with a image other than the one officially tagged # "latest", simply overwrite the official tag. Example: # -# docker tag ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.4 +# docker tag ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.6 # ghcr.io/zephyrproject-rtos/zephyr-build:latest # -# "latest" is just a regular tag like "v0.26.4", it may or many not name +# "latest" is just a regular tag like "v0.26.6", it may or many not name # the most recent image. # # To automatically restore the official "latest" tag, just delete it: @@ -54,7 +54,7 @@ main() run_command() { - # zephyr-build:v0.26.4 has /opt/toolchains/zephyr-sdk-0.16.1 + # zephyr-build:v0.26.6 has /opt/toolchains/zephyr-sdk-0.16.4 # https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags # # Keep this SDK version identical to the one in @@ -63,7 +63,7 @@ run_command() --workdir /zep_workspace \ $SOF_DOCKER_RUN \ --env REAL_CC --env http_proxy --env https_proxy \ - ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.4 \ + ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.6 \ ./sof/scripts/sudo-cwd.sh "$@" } From 0470e21e30dfb1966a019bb24184f15a2df1ab10 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Wed, 13 Dec 2023 15:48:04 +0200 Subject: [PATCH 2/2] .github/zephyr: Upgrade to Zephyr SDK 0.16.4 This adds support for imx8ulp. Signed-off-by: Daniel Baluta --- .github/workflows/zephyr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 572e1a6bfab2..e2d77667257c 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -248,12 +248,12 @@ jobs: # Keep this SDK version identical to the one in # sof/zephyr/docker-run.sh - - name: Cache Zephyr SDK 0.16.1 + - name: Cache Zephyr SDK 0.16.4 id: cache-zephyr-sdk uses: actions/cache@v3.0.11 with: - path: zephyr-sdk-0.16.1_windows-x86_64.7z - key: ${{ runner.os }}-cache-zephyr-sdk-0-16-1 + path: zephyr-sdk-0.16.4_windows-x86_64.7z + key: ${{ runner.os }}-cache-zephyr-sdk-0-16-4 # Wget is needed by Zephyr SDK setup.cmd installation script - name: Download wget @@ -261,11 +261,11 @@ jobs: run: | curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip - - name: Download Zephyr SDK 0.16.1 + - name: Download Zephyr SDK 0.16.4 if: ${{ steps.cache-zephyr-sdk.outputs.cache-hit != 'true' }} run: | # yamllint disable-line rule:line-length curl -L -O ` - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_windows-x86_64.7z + https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_windows-x86_64.7z # Unzips every .zip package to directory matching its name without extension - name: Unzip downloaded packages @@ -288,7 +288,7 @@ jobs: # setup.cmd may not be called in from msys shell as it does not parse # forward slash script input arguments correctly. - name: Install Zephyr SDK - run: zephyr-sdk-0.16.1_windows-x86_64/zephyr-sdk-0.16.1/setup.cmd /t all /h /c + run: zephyr-sdk-0.16.4_windows-x86_64/zephyr-sdk-0.16.4/setup.cmd /t all /h /c - name: Setup Python uses: actions/setup-python@v4