Skip to content

Commit f0d697e

Browse files
committed
[Telink] Manual Zephyr SDK update to check CI jobs
1 parent 3663762 commit f0d697e

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

.github/workflows/chef.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
branches:
2020
- master
2121
- 'v*-branch'
22+
- update_zephyr_3.7
2223
pull_request:
2324
merge_group:
2425

@@ -109,9 +110,9 @@ jobs:
109110
uses: ./.github/actions/checkout-submodules-and-bootstrap
110111
with:
111112
platform: telink
112-
# - name: Update Zephyr to specific revision (for developers purpose)
113-
# shell: bash
114-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 8b29ee6b118ebe6eeec3224dbe343474e11403d8"
113+
- name: Update Zephyr to specific revision (for developers purpose)
114+
shell: bash
115+
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 46ac12b997d6f1ced2c5cc86a7e21d880d4b114e"
115116
- name: CI Examples Telink
116117
shell: bash
117118
run: |

.github/workflows/examples-telink.yaml

+12-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
branches:
2020
- master
2121
- 'v*-branch'
22+
- update_zephyr_3.7
2223
pull_request:
2324
merge_group:
2425

@@ -57,8 +58,17 @@ jobs:
5758
with:
5859
gh-context: ${{ toJson(github) }}
5960

60-
# - name: Update Zephyr to specific revision (for developers purpose)
61-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 8b29ee6b118ebe6eeec3224dbe343474e11403d8"
61+
- name: Update Zephyr SDK (Temporary change for debugging purpose)
62+
run: |
63+
cd /opt/telink \
64+
rm -rf zephyr-sdk-0.16.1 \
65+
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 \
66+
tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
67+
rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
68+
zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf
69+
70+
- name: Update Zephyr to specific revision (for developers purpose)
71+
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 46ac12b997d6f1ced2c5cc86a7e21d880d4b114e"
6272

6373
- name: Build example Telink (B92 retention) Air Quality Sensor App
6474
# Run test for master and s07641069 PRs
@@ -77,7 +87,6 @@ jobs:
7787
- name: Build example Telink (W91) All Clusters App
7888
# Run test for master and s07641069 PRs
7989
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
80-
continue-on-error: true
8190
run: |
8291
./scripts/run_in_build_env.sh \
8392
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-all-clusters' build"
@@ -142,7 +151,6 @@ jobs:
142151

143152
- name: Build example Telink (W91) Lighting App with OTA, Factory Data
144153
# Run test for master and all PRs
145-
continue-on-error: true
146154
run: |
147155
./scripts/run_in_build_env.sh \
148156
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-light-ota-factory-data' build"
@@ -308,7 +316,6 @@ jobs:
308316
- name: Build example Telink (W91) Window Covering App
309317
# Run test for master and s07641069 PRs
310318
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
311-
continue-on-error: true
312319
run: |
313320
./scripts/run_in_build_env.sh \
314321
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-window-covering' build"

integrations/docker/images/stage-2/chip-build-telink/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ RUN set -x \
1111
# Setup toolchain
1212
WORKDIR /opt/telink
1313
RUN set -x \
14-
&& 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 \
15-
&& tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
16-
&& rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
17-
&& zephyr-sdk-0.16.1/setup.sh -t riscv64-zephyr-elf \
14+
&& 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 \
15+
&& tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
16+
&& rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
17+
&& zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
1818
&& : # last line
1919

2020
# Setup Zephyr
@@ -34,7 +34,7 @@ RUN set -x \
3434

3535
FROM ghcr.io/project-chip/chip-build:${VERSION}
3636

37-
COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/
37+
COPY --from=build /opt/telink/zephyr-sdk-0.17.0/ /opt/telink/zephyr-sdk-0.17.0/
3838
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
3939

4040
RUN set -x \
@@ -45,4 +45,4 @@ RUN set -x \
4545
&& : # last line
4646

4747
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
48-
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
48+
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc
3838
COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox
3939

4040
COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
41-
COPY --from=telink /opt/telink/zephyr-sdk-0.16.1 /opt/telink/zephyr-sdk-0.16.1
41+
COPY --from=telink /opt/telink/zephyr-sdk-0.17.0 /opt/telink/zephyr-sdk-0.17.0
4242

4343
COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk
4444

@@ -125,7 +125,7 @@ ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
125125
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
126126
ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
127127
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
128-
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
128+
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
129129
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1
130130
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
131131
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5

0 commit comments

Comments
 (0)