From a6799db326c4071550aa4db9eff949a99dc25cb9 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Mon, 3 Feb 2025 14:10:20 +0000 Subject: [PATCH 1/3] [Telink] Manual Zephyr SDK update to check CI jobs --- .github/workflows/chef.yaml | 11 +++++++++++ .github/workflows/examples-telink.yaml | 13 +++++++++++++ integrations/docker/images/base/chip-build/version | 2 +- .../images/stage-2/chip-build-telink/Dockerfile | 12 ++++++------ .../images/vscode/chip-build-vscode/Dockerfile | 4 ++-- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index b80aad17e2f7f2..09b3379c327924 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -28,6 +28,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # Required to Update Zephyr SDK (for developers purpose) + TELINK_ZEPHYR_SDK_DIR: /opt/telink/zephyr-sdk-0.17.0 jobs: chef_linux: @@ -105,6 +107,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Update Zephyr SDK (for developers purpose) + run: | + set -e + cd /opt/telink + rm -rf zephyr-sdk-0.16.1 + curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz + tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz + rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz + zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf - name: Checkout submodules & Bootstrap uses: ./.github/actions/checkout-submodules-and-bootstrap with: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 22905124813572..75569cdfec53c3 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -28,6 +28,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # Required to Update Zephyr SDK (for developers purpose) + TELINK_ZEPHYR_SDK_DIR: /opt/telink/zephyr-sdk-0.17.0 jobs: telink: @@ -46,6 +48,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + + - name: Update Zephyr SDK (for developers purpose) + run: | + set -e + cd /opt/telink + rm -rf zephyr-sdk-0.16.1 + curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz + tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz + rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz + zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf + - name: Checkout submodules & Bootstrap uses: ./.github/actions/checkout-submodules-and-bootstrap with: diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 1939f7e2b4d3b0..0b4df4bdb9dde9 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -104 : [Telink] Update Docker image (Zephyr update) +105 : [Telink] Update Docker image (Zephyr SDK update) diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index a0d3cb8c92253b..e887fa775978c3 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -11,10 +11,10 @@ RUN set -x \ # Setup toolchain WORKDIR /opt/telink RUN set -x \ - && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \ - && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \ - && rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \ - && zephyr-sdk-0.16.1/setup.sh -t riscv64-zephyr-elf \ + && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \ + && tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \ + && rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \ + && zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \ && : # last line # Setup Zephyr @@ -34,7 +34,7 @@ RUN set -x \ FROM ghcr.io/project-chip/chip-build:${VERSION} -COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/ +COPY --from=build /opt/telink/zephyr-sdk-0.17.0/ /opt/telink/zephyr-sdk-0.17.0/ COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/ RUN set -x \ @@ -45,4 +45,4 @@ RUN set -x \ && : # last line ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr -ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1 +ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0 diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index ba46b7c10f06a3..6b2d7d418da411 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -38,7 +38,7 @@ COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject -COPY --from=telink /opt/telink/zephyr-sdk-0.16.1 /opt/telink/zephyr-sdk-0.16.1 +COPY --from=telink /opt/telink/zephyr-sdk-0.17.0 /opt/telink/zephyr-sdk-0.17.0 COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk @@ -126,7 +126,7 @@ ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa ENV QEMU_ESP32_DIR=/opt/espressif/qemu ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr -ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1 +ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0 ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.17.0 From 04f678d35f3ad1e2c677a1edeb0a8500f0a93838 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Mon, 10 Feb 2025 19:52:23 +0000 Subject: [PATCH 2/3] [Telink] Update Zephyr revision & remove dev changes --- .github/workflows/chef.yaml | 11 ----------- .github/workflows/examples-telink.yaml | 12 ------------ .../images/stage-2/chip-build-telink/Dockerfile | 2 +- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 09b3379c327924..b80aad17e2f7f2 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -28,8 +28,6 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true - # Required to Update Zephyr SDK (for developers purpose) - TELINK_ZEPHYR_SDK_DIR: /opt/telink/zephyr-sdk-0.17.0 jobs: chef_linux: @@ -107,15 +105,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Update Zephyr SDK (for developers purpose) - run: | - set -e - cd /opt/telink - rm -rf zephyr-sdk-0.16.1 - curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz - tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz - rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz - zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf - name: Checkout submodules & Bootstrap uses: ./.github/actions/checkout-submodules-and-bootstrap with: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 75569cdfec53c3..0dd31dfccc87b0 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -28,8 +28,6 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true - # Required to Update Zephyr SDK (for developers purpose) - TELINK_ZEPHYR_SDK_DIR: /opt/telink/zephyr-sdk-0.17.0 jobs: telink: @@ -49,16 +47,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Update Zephyr SDK (for developers purpose) - run: | - set -e - cd /opt/telink - rm -rf zephyr-sdk-0.16.1 - curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz - tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz - rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz - zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf - - name: Checkout submodules & Bootstrap uses: ./.github/actions/checkout-submodules-and-bootstrap with: diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index e887fa775978c3..773b18ae3f15ec 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -18,7 +18,7 @@ RUN set -x \ && : # last line # Setup Zephyr -ARG ZEPHYR_REVISION=52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d +ARG ZEPHYR_REVISION=ce4027fc0768b8509758af2e43f74e3fd2c7d58d WORKDIR /opt/telink/zephyrproject RUN set -x \ && python3 -m pip install --break-system-packages -U --no-cache-dir west \ From 2fa22a1070a13032ebbe7d46e91684c76185a10a Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Mon, 10 Feb 2025 19:54:59 +0000 Subject: [PATCH 3/3] typo --- .github/workflows/examples-telink.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 0dd31dfccc87b0..22905124813572 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -46,7 +46,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Checkout submodules & Bootstrap uses: ./.github/actions/checkout-submodules-and-bootstrap with: