Skip to content

Commit

Permalink
ci: upgrade to Zephyr SDK 0.17.0
Browse files Browse the repository at this point in the history
0.16.4 doesn't support PTL, upgrade to the current 0.17.0.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
  • Loading branch information
lyakh committed Dec 18, 2024
1 parent 726b4b2 commit 6ccfe32
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,24 +260,24 @@ jobs:

# Keep this SDK version identical to the one in
# sof/zephyr/docker-run.sh
- name: Cache Zephyr SDK 0.16.4
- name: Cache Zephyr SDK 0.17.0
id: cache-zephyr-sdk
uses: actions/cache@v4
with:
path: zephyr-sdk-0.16.4_windows-x86_64.7z
key: ${{ runner.os }}-cache-zephyr-sdk-0-16-4
path: zephyr-sdk-0.17.0_windows-x86_64.7z
key: ${{ runner.os }}-cache-zephyr-sdk-0-17-0

# Wget is needed by Zephyr SDK setup.cmd installation script
- name: Download wget
if: ${{ steps.cache-wget.outputs.cache-hit != 'true' }}
run: |
curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip
- name: Download Zephyr SDK 0.16.4
- name: Download Zephyr SDK 0.17.0
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.4/zephyr-sdk-0.16.4_windows-x86_64.7z
https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_windows-x86_64.7z
# Unzips every .zip package to directory matching its name without extension
- name: Unzip downloaded packages
Expand All @@ -300,7 +300,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.4_windows-x86_64/zephyr-sdk-0.16.4/setup.cmd /t all /h /c
run: zephyr-sdk-0.17.0_windows-x86_64/zephyr-sdk-0.17.0/setup.cmd /t all /h /c

- name: Setup Python
uses: actions/setup-python@v5
Expand Down
4 changes: 2 additions & 2 deletions zephyr/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ main()

run_command()
{
# zephyr-build:v0.26.6 has /opt/toolchains/zephyr-sdk-0.16.4
# zephyr-build:v0.27.4 has /opt/toolchains/zephyr-sdk-0.17.0
# https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags
#
# Keep this SDK version identical to the one in
Expand All @@ -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.6 \
ghcr.io/zephyrproject-rtos/zephyr-build:v0.27.4 \
./sof/scripts/sudo-cwd.sh "$@"
}

Expand Down

0 comments on commit 6ccfe32

Please sign in to comment.