From ab17ad0f21a39e46ef62d58632a759405ab59660 Mon Sep 17 00:00:00 2001 From: Andrey Borisovich Date: Thu, 18 May 2023 20:36:33 +0200 Subject: [PATCH 1/6] west.yml: upgraded Zephyr revision to support new Zephyr SDK 0.16.1 Commit https://github.com/zephyrproject-rtos/zephyr/commit/9fc99928caf0 requires new Zephyr SDK 0.16.1 to work and breaks compatibility to older Zephyr revisions. Signed-off-by: Andrey Borisovich --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index cc626256d346..d24e69e96c8f 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: fa5117225af9c2167449d79cccd5f0e81bb10696 + revision: 9fc99928caf04c3ae78871f803ce8cee83541ae0 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision From 536bf320cdad7e185d754c8eb36fae3e78d5ae0f Mon Sep 17 00:00:00 2001 From: Andrey Borisovich Date: Thu, 18 May 2023 18:00:58 +0200 Subject: [PATCH 2/6] workflows: Zephyr build-windows upgrade Zephyr SDK to 0.16.1 Zephyr main branch requires new Zephyr SDK. Upgraded version of Zephyr SDK to newest available v0.16.1 in the build-windows job. New SDK is backward compatible with old Zephyr revisions so the upgrade is applied to all CI. Signed-off-by: Andrey Borisovich --- .github/workflows/zephyr.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index f0f31e4aece1..414d8154f68e 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -204,12 +204,12 @@ jobs: # Keep this SDK version identical to the one in # sof/zephyr/docker-run.sh - - name: Cache Zephyr SDK 0.15.2 + - name: Cache Zephyr SDK 0.16.1 id: cache-zephyr-sdk uses: actions/cache@v3.0.11 with: - path: zephyr-sdk-0.15.2_windows-x86_64.zip - key: ${{ runner.os }}-cache-zephyr-sdk-0-15-2 + path: zephyr-sdk-0.16.1_windows-x86_64.7z + key: ${{ runner.os }}-cache-zephyr-sdk-0-16-1 # Unzip is needed by Zephyr SDK setup.cmd installation script - name: Download unzip @@ -224,15 +224,17 @@ jobs: run: | curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip - - name: Download Zephyr SDK 0.15.2 + - name: Download Zephyr SDK 0.16.1 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.15.2/zephyr-sdk-0.15.2_windows-x86_64.zip + https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_windows-x86_64.7z # Unzips every .zip package to directory matching its name without extension - name: Unzip downloaded packages - run: 7z x *.zip -o* + run: | + 7z x *.zip -o* + 7z x *.7z -o* - name: Add unzip to system PATH run: | @@ -249,7 +251,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.15.2_windows-x86_64/zephyr-sdk-0.15.2/setup.cmd /t all /h /c + run: zephyr-sdk-0.16.1_windows-x86_64/zephyr-sdk-0.16.1/setup.cmd /t all /h /c - name: Setup Python uses: actions/setup-python@v4 From 66de6f87b415cfd5bbcc555e29f3328a1a9f0b13 Mon Sep 17 00:00:00 2001 From: Andrey Borisovich Date: Thu, 18 May 2023 19:12:24 +0200 Subject: [PATCH 3/6] workflows: Zephyr build-windows removed unzpip package Installation of new Zephyr SDK 0.16.1 does not require unzip anymore in the setup.cmd script. This tool had been replaced by 7z that is by default present on all Github Windows runners. Signed-off-by: Andrey Borisovich --- .github/workflows/zephyr.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 414d8154f68e..aa11b6a4089d 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -211,13 +211,6 @@ jobs: path: zephyr-sdk-0.16.1_windows-x86_64.7z key: ${{ runner.os }}-cache-zephyr-sdk-0-16-1 - # Unzip is needed by Zephyr SDK setup.cmd installation script - - name: Download unzip - if: ${{ steps.cache-unzip.outputs.cache-hit != 'true' }} - run: | - curl -L -o unzip-5.51-1-bin.zip ` - https://gnuwin32.sourceforge.net/downlinks/unzip-bin-zip.php - # Wget is needed by Zephyr SDK setup.cmd installation script - name: Download wget if: ${{ steps.cache-wget.outputs.cache-hit != 'true' }} From 6651fb5c15bf5f65dd68eb32c19a8a25fcdb83dd Mon Sep 17 00:00:00 2001 From: Andrey Borisovich Date: Thu, 18 May 2023 19:32:24 +0200 Subject: [PATCH 4/6] workflows: Zephyr build-linux upgraded Docker container with Zephyr SDK New Docker container tagged v0.26.4 contains new Zephyr SDK v0.16.1 needed to build with Zephyr main branch. New Zephyr SDK is backward compatible with the older Zephyr revisions so the upgrade is done for SOF manifest revisions too. Signed-off-by: Andrey Borisovich --- 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 24aedddd7385..bf1c37a46cdc 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.24.1 +# docker tag ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.4 # ghcr.io/zephyrproject-rtos/zephyr-build:latest # -# "latest" is just a regular tag like "v0.24.1", it may or many not name +# "latest" is just a regular tag like "v0.26.4", 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.24.13 has /opt/toolchains/zephyr-sdk-0.15.2 + # zephyr-build:v0.26.4 has /opt/toolchains/zephyr-sdk-0.16.1 # 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.24.13 \ + ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.4 \ ./sof/scripts/sudo-cwd.sh "$@" } From 1816cd75da2c6b44182d2f700dafe3bc1648f786 Mon Sep 17 00:00:00 2001 From: Andrey Borisovich Date: Thu, 18 May 2023 20:00:41 +0200 Subject: [PATCH 5/6] workflows: Zephyr build-linux job upgraded runner OS to Ubuntu 22.04 New Zephyr Docker container v.26.4 is based on Ubuntu 22.04, upgrading build-linux job OS to match the one in the container. Signed-off-by: Andrey Borisovich --- .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 aa11b6a4089d..1176c4deafe4 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -59,7 +59,7 @@ jobs: fi build-linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: From 52c0502fff04cc3c5c31435765c6ae56a37cf0db Mon Sep 17 00:00:00 2001 From: Andrey Borisovich Date: Thu, 18 May 2023 20:09:09 +0200 Subject: [PATCH 6/6] workflows: sparse-zephyr upgraded runner OS to Ubuntu 22.04 Runner OS for the Zephyr workflow had been updated to Ubuntu 22.04, so upgrading this workflow too. Signed-off-by: Andrey Borisovich --- .github/workflows/sparse-zephyr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml index 48c2d2482067..b80cb10b33ac 100644 --- a/.github/workflows/sparse-zephyr.yml +++ b/.github/workflows/sparse-zephyr.yml @@ -15,9 +15,9 @@ jobs: # sof/scripts/parse_sparse_output.sh warnings-subset: - # We're sharing binaries with the zephyr-build container so keep + # We're sharing the sparse binary with the zephyr-build container so keep # this in sync with it. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false