[Telink] Update Zephyr revision & SDK

project-chip · Dec 2, 2024 · 52c1547 · 52c1547
1 parent 368924c
commit 52c1547
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -112,7 +112,7 @@ jobs:
                 platform: telink
             - name: Update Zephyr to specific revision (for developers purpose)
               shell: bash
-              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 46ac12b997d6f1ced2c5cc86a7e21d880d4b114e"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ed365fdadcf380a0b2e543a7d4ba88ed4f227466"
             - name: CI Examples Telink
               shell: bash
               run: |

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -47,6 +47,20 @@ 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: Update Zephyr to specific revision (for developers purpose)
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ed365fdadcf380a0b2e543a7d4ba88ed4f227466"
+
             - name: Checkout submodules & Bootstrap
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
@@ -58,18 +72,6 @@ jobs:
               with:
                 gh-context: ${{ toJson(github) }}
 
-            - name: Update Zephyr SDK (Temporary change for debugging purpose)
-              run: |
-                  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: Update Zephyr to specific revision (for developers purpose)
-              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 46ac12b997d6f1ced2c5cc86a7e21d880d4b114e"
-
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               # Run test for master and s07641069 PRs
               if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'