From 3c75ed0e8351fecb3476118c7f25ad31fb11f35e Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Tue, 18 Jul 2023 19:00:42 -0700 Subject: [PATCH] Updating script, and running to pin README.md and other files (#28030) * Updating script, and running to pin readmes and files * Restyled by shfmt * Fixing build script * Fixing restyled to ignore this * Fixing path * Restyled by shellharden * Restyled by shfmt * Fixing restyle * Testing this ignore * Correct patch --------- Co-authored-by: Restyled.io --- .github/workflows/lint.yml | 2 +- .github/workflows/roll_and_build_docker.yaml | 2 +- .restyled.yaml | 24 ++++---- examples/all-clusters-app/ameba/README.md | 4 +- examples/all-clusters-app/telink/Readme.md | 4 +- .../all-clusters-minimal-app/ameba/README.md | 4 +- .../all-clusters-minimal-app/telink/Readme.md | 4 +- examples/bridge-app/telink/README.md | 4 +- examples/chef/README.md | 6 +- examples/contact-sensor-app/telink/README.md | 4 +- examples/light-switch-app/ameba/README.md | 4 +- examples/light-switch-app/telink/README.md | 4 +- examples/lighting-app/ameba/README.md | 4 +- examples/lighting-app/qpg/README.md | 16 ++++- examples/lighting-app/telink/README.md | 4 +- examples/lock-app/qpg/README.md | 16 ++++- examples/lock-app/telink/README.md | 4 +- examples/ota-requestor-app/ameba/README.md | 4 +- examples/ota-requestor-app/telink/Readme.md | 4 +- examples/persistent-storage/qpg/README.md | 16 ++++- examples/pigweed-app/ameba/README.md | 4 +- examples/pump-app/telink/README.md | 4 +- examples/pump-controller-app/telink/README.md | 4 +- .../telink/README.md | 4 +- examples/thermostat/telink/Readme.md | 4 +- examples/window-app/telink/README.md | 4 +- integrations/docker/build-all.sh | 14 ++--- .../docker/images/base/chip-build/version | 2 +- scripts/helpers/roll_docker_version.sh | 58 +++++++++++++++++-- src/test_driver/tizen/README.md | 4 +- 30 files changed, 162 insertions(+), 74 deletions(-) mode change 120000 => 100644 examples/lighting-app/qpg/README.md mode change 120000 => 100644 examples/lock-app/qpg/README.md mode change 120000 => 100644 examples/persistent-storage/qpg/README.md diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6bc7d403c2f491..c9e90a4e5f525d 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:0.8 + image: ghcr.io/project-chip/chip-build:1 steps: - name: Checkout diff --git a/.github/workflows/roll_and_build_docker.yaml b/.github/workflows/roll_and_build_docker.yaml index 7d94d71cf12204..b4d5453aefbcbc 100644 --- a/.github/workflows/roll_and_build_docker.yaml +++ b/.github/workflows/roll_and_build_docker.yaml @@ -8,7 +8,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Roll docker versions - run: ./scripts/helpers/roll_docker_version.sh ./integrations/docker/images/base/chip-build/version + run: ./scripts/helpers/roll_docker_version.sh --reason="Automated roll by GitHub Action" - uses: EndBug/add-and-commit@v9 with: default_author: github_actions diff --git a/.restyled.yaml b/.restyled.yaml index 32a77fee6fe5f9..1351fbdfa33c0f 100644 --- a/.restyled.yaml +++ b/.restyled.yaml @@ -81,11 +81,11 @@ exclude: - "src/controller/java/generated/java/**/*" # not formatted: generated files - "src/controller/java/zap-generated/**/*" # not formatted: generated files - "scripts/setup/bootstrap.sh" # tries to quote loop variable - + - "integrations/docker/build-all.sh" # tries to quote loop variable changed_paths: - maximum: 100000 - outcome: error + maximum: 100000 + outcome: error # Restylers to run, and how restylers: @@ -220,21 +220,21 @@ restylers: - "**/*.sh" - "**/*.bash" - name: autopep8 - image: 'restyled/restyler-autopep8:v2.0.0' + image: restyled/restyler-autopep8:v2.0.0 command: - - autopep8 - - '--in-place' + - autopep8 + - "--in-place" arguments: [] include: - - '**/*.py' + - "**/*.py" interpreters: - - python + - python - name: isort - image: 'restyled/restyler-isort:v5.11.2' + image: restyled/restyler-isort:v5.11.2 command: - - isort + - isort arguments: [] include: - - '**/*.py' + - "**/*.py" interpreters: - - python + - python diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index 656c35cb2998af..d02447ebfb6330 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:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:1 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:1 - Setup build environment: diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/Readme.md index 6a646341c3e359..e05afa4e3a1e30 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/Readme.md @@ -11,13 +11,13 @@ creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index 467d15b3be73e4..21d7c94f4859f0 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:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:1 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:1 ``` - Setup build environment: diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/Readme.md index 5531070453de45..66eda43b732c9b 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/Readme.md @@ -11,13 +11,13 @@ for creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index 9055e4c7c3a669..7fe72ca3e5fa26 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -88,13 +88,13 @@ defined: 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/chef/README.md b/examples/chef/README.md index b9218bf5de5d55..98ae9ac3ec2ecb 100644 --- a/examples/chef/README.md +++ b/examples/chef/README.md @@ -101,7 +101,7 @@ relevant platform image. You can simulate the workflow locally by mounting your CHIP repo into a container and executing the CI command: ```shell -docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-$PLATFORM:$VERSION +docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-$PLATFORM:1$VERSION ``` In the container: @@ -128,7 +128,7 @@ chef_$PLATFORM: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-$PLATFORM:$VERSION + image: ghcr.io/project-chip/chip-build-$PLATFORM:1$VERSION options: --user root steps: @@ -183,7 +183,7 @@ command for these targets. To test your configuration locally, you may employ a similar strategy as in CI: ```shell -docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-vscode:$VERSION +docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-vscode:1$VERSION ``` In the container: diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index 22933e4fd4f4ba..ec755135003da3 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-app/telink/README.md @@ -9,13 +9,13 @@ You can use this example as a reference for creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index 8c24568a1b54d2..03ee7caacb0447 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:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:1 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:1 - Setup build environment: diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 32429c84743f9c..6b44caa1e0ba50 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -14,13 +14,13 @@ creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index 45c30db736070f..bd764b23558643 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:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:1 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:1 - Setup build environment: diff --git a/examples/lighting-app/qpg/README.md b/examples/lighting-app/qpg/README.md deleted file mode 120000 index dfb11955dc29c0..00000000000000 --- a/examples/lighting-app/qpg/README.md +++ /dev/null @@ -1 +0,0 @@ -../../platform/qpg/README.md \ No newline at end of file diff --git a/examples/lighting-app/qpg/README.md b/examples/lighting-app/qpg/README.md new file mode 100644 index 00000000000000..d8e070848f540c --- /dev/null +++ b/examples/lighting-app/qpg/README.md @@ -0,0 +1,15 @@ +--- +orphan: true +--- + +# Matter QPG6105 SDK + +## Qorvo SDK + +More detailed information on the Qorvo SDK can be found in the +[Qorvo Matter SDK](https://github.com/Qorvo/QMatter). + +## More information + +For more information on our product line and support options, please visit +[www.qorvo.com](https://www.qorvo.com) or contact us at diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index a76f539f0f2b17..286f289303500f 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -12,13 +12,13 @@ a reference for creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/lock-app/qpg/README.md b/examples/lock-app/qpg/README.md deleted file mode 120000 index dfb11955dc29c0..00000000000000 --- a/examples/lock-app/qpg/README.md +++ /dev/null @@ -1 +0,0 @@ -../../platform/qpg/README.md \ No newline at end of file diff --git a/examples/lock-app/qpg/README.md b/examples/lock-app/qpg/README.md new file mode 100644 index 00000000000000..d8e070848f540c --- /dev/null +++ b/examples/lock-app/qpg/README.md @@ -0,0 +1,15 @@ +--- +orphan: true +--- + +# Matter QPG6105 SDK + +## Qorvo SDK + +More detailed information on the Qorvo SDK can be found in the +[Qorvo Matter SDK](https://github.com/Qorvo/QMatter). + +## More information + +For more information on our product line and support options, please visit +[www.qorvo.com](https://www.qorvo.com) or contact us at diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index 2715a195d3b387..466e053b2a9944 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -12,13 +12,13 @@ a reference for creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index ef18e95eabbf8d..cb175df24d9116 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:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:1 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:1 - Setup build environment: diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/Readme.md index aa5060c0b18172..b072547d9e5a27 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/Readme.md @@ -5,13 +5,13 @@ 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/persistent-storage/qpg/README.md b/examples/persistent-storage/qpg/README.md deleted file mode 120000 index dfb11955dc29c0..00000000000000 --- a/examples/persistent-storage/qpg/README.md +++ /dev/null @@ -1 +0,0 @@ -../../platform/qpg/README.md \ No newline at end of file diff --git a/examples/persistent-storage/qpg/README.md b/examples/persistent-storage/qpg/README.md new file mode 100644 index 00000000000000..d8e070848f540c --- /dev/null +++ b/examples/persistent-storage/qpg/README.md @@ -0,0 +1,15 @@ +--- +orphan: true +--- + +# Matter QPG6105 SDK + +## Qorvo SDK + +More detailed information on the Qorvo SDK can be found in the +[Qorvo Matter SDK](https://github.com/Qorvo/QMatter). + +## More information + +For more information on our product line and support options, please visit +[www.qorvo.com](https://www.qorvo.com) or contact us at diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 8e3e2513c05550..77ea1e196429f7 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:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:1 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:1 - Setup build environment: diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index 9fb9ca20b2ee1b..8b0dbda6b2add5 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -13,13 +13,13 @@ reference for creating your own pump application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index bbf5ced1975488..1e17a923ff896f 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -14,13 +14,13 @@ your own pump application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index 6e2e7850735b72..964c0f27d39b2f 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -13,13 +13,13 @@ creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/Readme.md index bc60f34b528a71..fdd4730c6f831a 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/telink/Readme.md @@ -9,13 +9,13 @@ You can use this example as a reference for creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index cc4a63d926b696..9fef8eaa8972b1 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -12,13 +12,13 @@ for creating your own application. 1. Pull docker image from repository: ```bash - $ docker pull ghcr.io/project-chip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:1 ``` 1. Run docker container: ```bash - $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:latest + $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1 ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/integrations/docker/build-all.sh b/integrations/docker/build-all.sh index 1d4f48cdabeb7b..5b684b63a063b3 100755 --- a/integrations/docker/build-all.sh +++ b/integrations/docker/build-all.sh @@ -28,12 +28,12 @@ ALL_ARGS="" for i in "$@"; do case $i in - -p=* | --path=*) - SUB_PATH="${i#*=}" - ;; - *) - ALL_ARGS="$ALL_ARGS ${i#*=}" - ;; + -p=* | --path=*) + SUB_PATH="${i#*=}" + ;; + *) + ALL_ARGS="$ALL_ARGS ${i#*=}" + ;; esac done @@ -46,7 +46,7 @@ function build_image() { echo "PARSE_PATH: $PARSE_PATH" echo "ARGS_TO_PASS: $ARGS_TO_PASS" - find "$(git rev-parse --show-toplevel)"/integrations/docker/images/"$PARSE_PATH" -name Dockerfile ! -path "*chip-cert-bins/*" | while read -r dockerfile; do + find "$(git rev-parse --show-toplevel)"/integrations/docker/images/$PARSE_PATH -name Dockerfile ! -path "*chip-cert-bins/*" | while read -r dockerfile; do echo "$(dirname "$dockerfile")" pushd "$(dirname "$dockerfile")" >/dev/null ./build.sh "$ARGS_TO_PASS" diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index d00491fd7e5bb6..2758ff7463d15a 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -1 +1 : Moving to GHCR diff --git a/scripts/helpers/roll_docker_version.sh b/scripts/helpers/roll_docker_version.sh index 6d36981a46ab41..545118d4842a56 100755 --- a/scripts/helpers/roll_docker_version.sh +++ b/scripts/helpers/roll_docker_version.sh @@ -1,22 +1,68 @@ #!/usr/bin/env bash -CURRENT_VERSION=$(sed 's/ .*//' ./integrations/docker/images/base/chip-build/version) +# +# Copyright (c) 2023 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. -echo "Current version: $CURRENT_VERSION" +# +# Usage: +# ./scripts/helpers/roll_docker_version.sh -v=X --reason="INSERT_REASON_HERE" +# +CURRENT_VERSION=$(sed 's/ .*//' ./integrations/docker/images/base/chip-build/version) NEXT_VERSION=$((CURRENT_VERSION + 1)) +ROLL_REASON="" +ALL_ARGS="" + +for i in "$@"; do + case $i in + -v=* | --version=*) + NEXT_VERSION="${i#*=}" + ;; + -r=* | --reason=*) + ROLL_REASON="${i#*=}" + ;; + *) + ALL_ARGS="$ALL_ARGS ${i#*=}" + ;; + esac +done +if [[ ! $ROLL_REASON ]]; then + echo 'Roll reason required, please add --reason="Why I am rolling"' + exit -1 +fi + +echo "Current version: $CURRENT_VERSION" echo "Next version: $NEXT_VERSION" +echo "Reason: $ROLL_REASON" +echo "" echo "Rolling workflows" -sed -r -i "s|image: ghcr\.io/project-chip/(.*):[0-9]*(\..*)?|image: ghcr.io/project-chip/\1:$NEXT_VERSION|" .github/workflows/*.yaml +sed -r -i "s|image: ghcr\.io/project-chip/(.*):[0-9,a-z,A-Z,-]*(\..*)?|image: ghcr.io/project-chip/\1:$NEXT_VERSION|" .github/workflows/*.yaml +sed -r -i "s|image: ghcr\.io/project-chip/(.*):[0-9,a-z,A-Z,-]*(\..*)?|image: ghcr.io/project-chip/\1:$NEXT_VERSION|" .github/workflows/*.yml echo "Rolling VSCode container" -sed -r -i "s|matter-dev-environment:local --version [0-9]*|matter-dev-environment:local --version $NEXT_VERSION|" .devcontainer/devcontainer.json +sed -r -i "s|matter-dev-environment:local --version [0-9,a-z,A-Z,-]*|matter-dev-environment:local --version $NEXT_VERSION|" .devcontainer/devcontainer.json echo "Rolling docker images" -sed -r -i "s|ARG VERSION=[0-9]*|ARG VERSION=$NEXT_VERSION|" integrations/docker/images/*/*/Dockerfile +find . -iname readme.md -not -path "./third_party/*" | xargs sed -r -i "s|ARG VERSION=[0-9,a-z,A-Z,-]*|ARG VERSION=$NEXT_VERSION|" echo "Rolling main docker version" -echo "$NEXT_VERSION" >./integrations/docker/images/base/chip-build/version +echo "$NEXT_VERSION : $ROLL_REASON" >./integrations/docker/images/base/chip-build/version + +echo "Rolling README.md files" +find . -iname readme.md -not -path "./third_party/*" | xargs sed -r -i "s|ghcr\.io/project-chip/(.*):[0-9,a-z,A-Z,-]*(\..*)?|ghcr.io/project-chip/\1:$NEXT_VERSION|" +echo "" echo "Done" diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index fc815d85f081aa..ce36f327d7abb1 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:latest +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:1 ``` ## 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:latest /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:1 /bin/bash ``` ### Clone the connectedhomeip repository