From acb75379f0eba9dab4ed0aa0872ea0f8c06cbe7a Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Thu, 30 May 2024 11:40:39 +0300 Subject: [PATCH] [Telink] Update Docker image (Zephyr update) test commit --- .github/workflows/chef.yaml | 6 +++--- .github/workflows/examples-telink.yaml | 4 ++-- integrations/docker/images/base/chip-build/version | 2 +- .../docker/images/stage-2/chip-build-telink/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 7531d97c00a10c..3feddcc2df60fd 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -108,9 +108,9 @@ jobs: uses: ./.github/actions/checkout-submodules-and-bootstrap with: 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 68deadeb5c20b82d68700e720d4580e8003bf1d8" + - 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 b1497f2cad8efb850b9edb2686d3f47eecc4c097" - name: CI Examples Telink shell: bash run: | diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 331ee5543932e9..b148cfc4385393 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -56,8 +56,8 @@ jobs: with: gh-context: ${{ toJson(github) }} - # - name: Update Zephyr to specific revision (for developers purpose) - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 68deadeb5c20b82d68700e720d4580e8003bf1d8" + - name: Update Zephyr to specific revision (for developers purpose) + run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b1497f2cad8efb850b9edb2686d3f47eecc4c097" - name: Build example Telink (B92 retention) Air Quality Sensor App run: | diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 05ab2a03dbdb4f..3458a0819286da 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -53 : [Tizen] Add libatomic.so to QEMU Docker image +54 : [Telink] Update Docker image (Zephyr update) diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index 1333a4bfaaa286..0a6734792e8816 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -12,7 +12,7 @@ RUN set -x \ && : # last line # Setup Zephyr -ARG ZEPHYR_REVISION=68deadeb5c20b82d68700e720d4580e8003bf1d8 +ARG ZEPHYR_REVISION=b1497f2cad8efb850b9edb2686d3f47eecc4c097 WORKDIR /opt/telink/zephyrproject RUN set -x \ && python3 -m pip install -U --no-cache-dir west \