From 0d66b0d0482e29ef1a1e49b2d95bde93967e7348 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Fri, 20 Oct 2023 13:58:46 +0300 Subject: [PATCH 1/3] [Telink] Use -p for activate to install requirements.telink.txt --- examples/air-quality-sensor-app/telink/README.md | 2 +- examples/all-clusters-app/telink/Readme.md | 2 +- examples/all-clusters-minimal-app/telink/Readme.md | 2 +- examples/bridge-app/telink/README.md | 2 +- examples/contact-sensor-app/telink/README.md | 2 +- examples/light-switch-app/telink/README.md | 2 +- examples/lighting-app/telink/README.md | 2 +- examples/lock-app/telink/README.md | 2 +- examples/ota-requestor-app/telink/Readme.md | 2 +- examples/pump-app/telink/README.md | 2 +- examples/pump-controller-app/telink/README.md | 2 +- examples/resource-monitoring-app/telink/README.md | 2 +- examples/shell/telink/README.md | 2 +- examples/smoke-co-alarm-app/telink/README.md | 2 +- examples/temperature-measurement-app/telink/README.md | 2 +- examples/thermostat/telink/Readme.md | 2 +- examples/window-app/telink/README.md | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md index eecc7e8bbdbaa6..f91c701c00c527 100644 --- a/examples/air-quality-sensor-app/telink/README.md +++ b/examples/air-quality-sensor-app/telink/README.md @@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/Readme.md index a8881b7fdeb024..b8f5b95d828893 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/Readme.md @@ -23,7 +23,7 @@ creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/Readme.md index 53c750b806baf7..601fc52ba40fef 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/Readme.md @@ -23,7 +23,7 @@ for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index fd3d70c21e9b84..34e99505c11f4b 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -100,7 +100,7 @@ defined: 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index cef7f3364dd7dd..370ffbdee63a7f 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-app/telink/README.md @@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 6dc9970c5c732e..562be75144d584 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -26,7 +26,7 @@ creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index 666af084b2a8bf..278dfad530a1b0 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -24,7 +24,7 @@ a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index 2d8e0349d571a1..4d20388ce4277a 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -24,7 +24,7 @@ a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/Readme.md index 867f498f9df917..bf58651ce0253a 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/Readme.md @@ -17,7 +17,7 @@ 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index a5a656c68adeea..4d67799bfd28f5 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -25,7 +25,7 @@ reference for creating your own pump application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index 14153386de3b5e..6e3fa7ef3b0b88 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -26,7 +26,7 @@ your own pump application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/resource-monitoring-app/telink/README.md b/examples/resource-monitoring-app/telink/README.md index 3b6645171511e0..e418ad345911d1 100644 --- a/examples/resource-monitoring-app/telink/README.md +++ b/examples/resource-monitoring-app/telink/README.md @@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md index 2ff00f0046473f..744a0498a8f7d4 100755 --- a/examples/shell/telink/README.md +++ b/examples/shell/telink/README.md @@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md index f36ecb97d5925e..71fc7afd668a23 100755 --- a/examples/smoke-co-alarm-app/telink/README.md +++ b/examples/smoke-co-alarm-app/telink/README.md @@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index fda373eedf2ca9..77558a8968472a 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -25,7 +25,7 @@ creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/Readme.md index b73e5866b03173..ca93b6b1fb2fd3 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/telink/Readme.md @@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index 372dbcf8dba809..28dcc9aadd0ef6 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -24,7 +24,7 @@ for creating your own application. 2. Activate the build environment: ```bash - $ source ./scripts/activate.sh + $ source ./scripts/activate.sh -p all,telink ``` 3. In the example dir run (replace __ with your board name, for From aa0c38aeac0cadf213480ebb6c33391c11e2f448 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Fri, 20 Oct 2023 14:08:34 +0300 Subject: [PATCH 2/3] Update builds to docker version 22 --- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 10 +++++----- .github/workflows/chef.yaml | 8 ++++---- .github/workflows/cirque.yaml | 2 +- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-asr.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .github/workflows/examples-cc13x2x7_26x2x7.yaml | 2 +- .github/workflows/examples-cc32xx.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 ++-- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .github/workflows/examples-linux-imx.yaml | 2 +- .github/workflows/examples-linux-standalone.yaml | 2 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-openiotsdk.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-stm32.yaml | 3 +-- .github/workflows/examples-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/minimal-build.yaml | 2 +- .github/workflows/qemu.yaml | 4 ++-- .github/workflows/release_artifacts.yaml | 4 ++-- .github/workflows/smoketest-android.yaml | 2 +- .github/workflows/tests.yaml | 4 ++-- .github/workflows/unit_integration_test.yaml | 2 +- .github/workflows/zap_regeneration.yaml | 2 +- .github/workflows/zap_templates.yaml | 2 +- examples/all-clusters-app/ameba/README.md | 4 ++-- examples/all-clusters-minimal-app/ameba/README.md | 4 ++-- examples/light-switch-app/ameba/README.md | 4 ++-- examples/lighting-app/ameba/README.md | 4 ++-- examples/ota-requestor-app/ameba/README.md | 4 ++-- examples/pigweed-app/ameba/README.md | 4 ++-- integrations/cloudbuild/build-all.yaml | 6 +++--- integrations/cloudbuild/chef.yaml | 6 +++--- integrations/cloudbuild/smoke-test.yaml | 14 +++++++------- src/test_driver/tizen/README.md | 4 ++-- 47 files changed, 75 insertions(+), 76 deletions(-) diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index e6f02432b16793..2a1dee179aa3e0 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5412d2956536dc..f61013df986f9b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -131,7 +131,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -279,7 +279,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -339,7 +339,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -447,7 +447,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 6767d78ea46cf3..2b5b34478b677f 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 options: --user root steps: @@ -54,7 +54,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:21 + image: ghcr.io/project-chip/chip-build-esp32:22 options: --user root steps: @@ -75,7 +75,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:21 + image: ghcr.io/project-chip/chip-build-nrf-platform:22 options: --user root steps: @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:21 + image: ghcr.io/project-chip/chip-build-telink:22 options: --user root steps: diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 25f6484d4bf2ad..c19e1dd911755c 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -40,7 +40,7 @@ jobs: # need to run with privilege, which isn't supported by job.XXX.contaner # https://github.com/actions/container-action/issues/2 # container: - # image: ghcr.io/project-chip/chip-build-cirque:21 + # image: ghcr.io/project-chip/chip-build-cirque:22 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index efc82b13c13f9f..4e4e2abf319891 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-doxygen:21 + image: ghcr.io/project-chip/chip-build-doxygen:22 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 2e8e9465d90dca..42afb3ee37b1e7 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ameba:21 + image: ghcr.io/project-chip/chip-build-ameba:22 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index 2257c9ed54a62a..7bb7e790595f10 100644 --- a/.github/workflows/examples-asr.yaml +++ b/.github/workflows/examples-asr.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-asr:21 + image: ghcr.io/project-chip/chip-build-asr:22 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index 6564a304ee0fe8..53a43c267251c6 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-bouffalolab:21 + image: ghcr.io/project-chip/chip-build-bouffalolab:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index e7548e6f5413d5..4229f9800f2df8 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:21 + image: ghcr.io/project-chip/chip-build-ti:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index 1d0d65c30110fb..6c8d0362c38fff 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:21 + image: ghcr.io/project-chip/chip-build-ti:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index ee7159475b14d1..899ac288dc1c70 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:21 + image: ghcr.io/project-chip/chip-build-efr32:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 8fbf75f9ebea37..f1b8ff3b6f20a7 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:21 + image: ghcr.io/project-chip/chip-build-esp32:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -130,7 +130,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:21 + image: ghcr.io/project-chip/chip-build-esp32:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index b7f5e201291522..7fc006fe8f6698 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-infineon:21 + image: ghcr.io/project-chip/chip-build-infineon:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index df88c5a9dabaac..541106d618e2d5 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-k32w:21 + image: ghcr.io/project-chip/chip-build-k32w:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 44fdc7eac2b25d..4645b4e897d3ff 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-crosscompile:21 + image: ghcr.io/project-chip/chip-build-crosscompile:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index 4508d39da3f438..e34148a8ff0a91 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-imx:21 + image: ghcr.io/project-chip/chip-build-imx:22 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index d6740787696105..0c8f6c4cb1ee0f 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index cfd022219b3cf4..a73d825ee444e8 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-mbed-os:21 + image: ghcr.io/project-chip/chip-build-mbed-os:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index a879dc16e34e50..b5658efdcdf687 100644 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 5d05fb34f286ad..b1cf4cd87279f3 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:21 + image: ghcr.io/project-chip/chip-build-nrf-platform:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index 4fd20ce854f31b..de63249ee89d6a 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-openiotsdk:21 + image: ghcr.io/project-chip/chip-build-openiotsdk:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" options: --privileged diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index 2fcb50ae6a339f..3590b33a7c6829 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml index 5c8189cbe01711..dce5de01d786d9 100644 --- a/.github/workflows/examples-stm32.yaml +++ b/.github/workflows/examples-stm32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: @@ -68,4 +68,3 @@ jobs: if: ${{ !env.ACT }} with: platform-name: stm32 - diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index f3e5cfb59e2d88..225ddf16fd190b 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:21 + image: ghcr.io/project-chip/chip-build-telink:22 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 1e375b1ff0ea91..6099113b021e38 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen:21 + image: ghcr.io/project-chip/chip-build-tizen:22 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 319cce82a3c217..a227bdd6e16d08 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:21 + image: ghcr.io/project-chip/chip-build-android:22 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 42d8134470ba2b..21ae6619fe0e73 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index f4711ca5bfb9ff..fe27fe9cdd4eb1 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:21 + image: ghcr.io/project-chip/chip-build-java:22 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 941598cc6d7b65..b70ac09cb8ad5b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 steps: - name: Checkout diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index a6c95979f200fe..269692c1461410 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:21 + image: ghcr.io/project-chip/chip-build-minimal:22 steps: - name: Checkout diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index b16d073224d0af..ac677a83d61468 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:21 + image: ghcr.io/project-chip/chip-build-esp32-qemu:22 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -76,7 +76,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen-qemu:21 + image: ghcr.io/project-chip/chip-build-tizen-qemu:22 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index f0c816125f6190..9baca19da32835 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-esp32:21 + image: ghcr.io/project-chip/chip-build-esp32:22 steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-efr32:21 + image: ghcr.io/project-chip/chip-build-efr32:22 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 6b493cbb990627..ee0fe3400830ab 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:21 + image: ghcr.io/project-chip/chip-build-android:22 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index bb0a781f8b566c..9fa0003296128c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -402,7 +402,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 9ae5f2df18b295..9a365cb09c2438 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 5e50d26365b2d0..8ccd058de07b87 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index e84a8f6bc3e076..a83069e9468d28 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:21 + image: ghcr.io/project-chip/chip-build:22 defaults: run: shell: sh diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index a6c1684b997e50..ab7f1a5726765f 100644 --- a/examples/all-clusters-app/ameba/README.md +++ b/examples/all-clusters-app/ameba/README.md @@ -27,11 +27,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:21 + $ docker pull ghcr.io/project-chip/chip-build-ameba:22 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22 - Setup build environment: diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index cf21a5a9cff37f..86c2a0f222f3a1 100644 --- a/examples/all-clusters-minimal-app/ameba/README.md +++ b/examples/all-clusters-minimal-app/ameba/README.md @@ -27,13 +27,13 @@ The CHIP demo application is supported on - Pull docker image: ``` - $ docker pull ghcr.io/project-chip/chip-build-ameba:21 + $ docker pull ghcr.io/project-chip/chip-build-ameba:22 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22 ``` - Setup build environment: diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index 67ed7c829c50f1..835b11ea444c59 100644 --- a/examples/light-switch-app/ameba/README.md +++ b/examples/light-switch-app/ameba/README.md @@ -26,11 +26,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:21 + $ docker pull ghcr.io/project-chip/chip-build-ameba:22 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22 - Setup build environment: diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index e81705889be1a9..012ac3b89be5da 100644 --- a/examples/lighting-app/ameba/README.md +++ b/examples/lighting-app/ameba/README.md @@ -23,11 +23,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:21 + $ docker pull ghcr.io/project-chip/chip-build-ameba:22 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22 - Setup build environment: diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index c30a1fb435df59..2ce04fc328ceed 100644 --- a/examples/ota-requestor-app/ameba/README.md +++ b/examples/ota-requestor-app/ameba/README.md @@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities. - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:21 + $ docker pull ghcr.io/project-chip/chip-build-ameba:22 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22 - Setup build environment: diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 361ab87509d2bb..d294295bc5f0e5 100644 --- a/examples/pigweed-app/ameba/README.md +++ b/examples/pigweed-app/ameba/README.md @@ -31,11 +31,11 @@ following features are available: - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:21 + $ docker pull ghcr.io/project-chip/chip-build-ameba:22 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22 - Setup build environment: diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index 808c882ef7ac1f..f2c73a5eb2cd17 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -6,7 +6,7 @@ steps: - "--init" - "--recursive" id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -21,7 +21,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -85,7 +85,7 @@ steps: --target k32w-shell build --create-archives /workspace/artifacts/ - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index 488d05c19f4097..d0989a173705c7 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 2700s - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -27,7 +27,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index 8db671765d7b83..ef5e12328b7181 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" git submodule update --init --recursive id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -22,7 +22,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -43,7 +43,7 @@ steps: volumes: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -64,7 +64,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -86,7 +86,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -139,7 +139,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:21" + - name: "ghcr.io/project-chip/chip-build-vscode:22" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index e4e3800c8c7239..d1fc7e78447c1c 100644 --- a/src/test_driver/tizen/README.md +++ b/src/test_driver/tizen/README.md @@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in ```sh # Pull the image from hub.docker.com -docker pull ghcr.io/project-chip/chip-build-tizen-qemu:21 +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:22 ``` ## Building and Running Tests on QEMU @@ -21,7 +21,7 @@ All steps described below should be done inside the docker container. ```sh docker run -it --rm --name chip-tizen-qemu \ - ghcr.io/project-chip/chip-build-tizen-qemu:21 /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:22 /bin/bash ``` ### Clone the connectedhomeip repository From 8bcf3c1a8f9ad50970de88904f56dadebaf6b47e Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Fri, 20 Oct 2023 21:37:53 +0300 Subject: [PATCH 3/3] [Telink] try to use new variable for path --- examples/chef/chef.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/chef/chef.py b/examples/chef/chef.py index 841eed2001cf6b..184df5e5c10428 100755 --- a/examples/chef/chef.py +++ b/examples/chef/chef.py @@ -89,7 +89,9 @@ def load_config() -> None: config["ameba"]["MATTER_SDK"] = None config["ameba"]["MODEL"] = 'D' config["ameba"]["TTY"] = None - config["telink"]["ZEPHYR_BASE"] = os.environ.get('ZEPHYR_BASE') + config["telink"]["ZEPHYR_BASE"] = os.environ.get('TELINK_ZEPHYR_BASE') + config["telink"]["ZEPHYR_SDK_INSTALL_DIR"] = os.environ.get( + 'TELINK_ZEPHYR_SDK_DIR') config["telink"]["TTY"] = None flush_print(yaml.dump(config)) @@ -542,7 +544,13 @@ def main() -> int: flush_print( 'Path for Telink SDK was not found. Make sure Telink_SDK is set on your config.yaml file') exit(1) + if config['telink']['ZEPHYR_SDK_INSTALL_DIR'] is None: + flush_print( + 'Path for Telink toolchain was not found. Make sure Telink toolchain is set on your config.yaml file') + exit(1) shell.run_cmd("export ZEPHYR_TOOLCHAIN_VARIANT=zephyr") + shell.run_cmd( + f"export ZEPHYR_SDK_INSTALL_DIR={config['telink']['ZEPHYR_SDK_INSTALL_DIR']}") shell.run_cmd( f"export ZEPHYR_BASE={config['telink']['ZEPHYR_BASE']}") shell.run_cmd(