Skip to content

Commit 38a3c67

Browse files
authored
Revert "Add replaceable monitoring cluster implemenation (#1)"
This reverts commit b01f334.
1 parent b01f334 commit 38a3c67

File tree

499 files changed

+18147
-26376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

499 files changed

+18147
-26376
lines changed

.devcontainer/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
ARG BUILD_VERSION
1616

1717
# All tools required for compilation belong in chip-build, forms "truth" for CHIP build tooling
18-
FROM ghcr.io/project-chip/chip-build-vscode:${BUILD_VERSION}
19-
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
18+
FROM connectedhomeip/chip-build-vscode:${BUILD_VERSION}
2019

2120
# This Dockerfile contains things useful for an interactive development environment
2221
ARG USERNAME=vscode

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"mounts": [
1515
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
1616
],
17-
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1",
17+
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 0.7.3",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
2020
"customizations": {

.github/.wordlist.txt

-2
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ getManualTests
590590
getstarted
591591
getTests
592592
GH
593-
ghcr
594593
ghp
595594
githubusercontent
596595
gitignore
@@ -641,7 +640,6 @@ HomePods
641640
hostapd
642641
hostname
643642
href
644-
HEPA
645643
HTTPS
646644
HW
647645
hwadr

.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:1
36+
image: connectedhomeip/chip-build:0.7.3
3737

3838
steps:
3939
- name: Checkout

.github/workflows/build.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build:1
43+
image: connectedhomeip/chip-build:0.7.3
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -131,7 +131,7 @@ jobs:
131131
if: github.actor != 'restyled-io[bot]'
132132

133133
container:
134-
image: ghcr.io/project-chip/chip-build:1
134+
image: connectedhomeip/chip-build:0.7.3
135135
volumes:
136136
- "/tmp/log_output:/tmp/test_logs"
137137
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -275,7 +275,7 @@ jobs:
275275
if: github.actor != 'restyled-io[bot]'
276276

277277
container:
278-
image: ghcr.io/project-chip/chip-build:1
278+
image: connectedhomeip/chip-build:0.7.3
279279
volumes:
280280
- "/tmp/log_output:/tmp/test_logs"
281281
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -397,7 +397,7 @@ jobs:
397397
if: github.actor != 'restyled-io[bot]'
398398

399399
container:
400-
image: ghcr.io/project-chip/chip-build:1
400+
image: connectedhomeip/chip-build:0.7.3
401401
volumes:
402402
- "/tmp/log_output:/tmp/test_logs"
403403
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0

.github/workflows/chef.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.actor != 'restyled-io[bot]'
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:1
36+
image: connectedhomeip/chip-build:0.7.16
3737
options: --user root
3838

3939
steps:
@@ -54,7 +54,7 @@ jobs:
5454
if: github.actor != 'restyled-io[bot]'
5555

5656
container:
57-
image: ghcr.io/project-chip/chip-build-esp32:1
57+
image: connectedhomeip/chip-build-esp32:0.7.16
5858
options: --user root
5959

6060
steps:
@@ -64,8 +64,6 @@ jobs:
6464
uses: ./.github/actions/checkout-submodules-and-bootstrap
6565
with:
6666
platform: esp32
67-
- name: Fixup GdbGui requirement
68-
run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
6967
- name: CI Examples ESP32
7068
shell: bash
7169
run: |
@@ -77,7 +75,7 @@ jobs:
7775
if: github.actor != 'restyled-io[bot]'
7876

7977
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:1
78+
image: connectedhomeip/chip-build-nrf-platform:0.7.16
8179
options: --user root
8280

8381
steps:

.github/workflows/cirque.yaml

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Cirque
16+
17+
on:
18+
push:
19+
pull_request:
20+
merge_group:
21+
workflow_dispatch:
22+
23+
concurrency:
24+
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
25+
cancel-in-progress: true
26+
27+
env:
28+
CHIP_NO_LOG_TIMESTAMPS: true
29+
30+
jobs:
31+
cirque:
32+
name: Cirque
33+
34+
env:
35+
DOCKER_RUN_VERSION: 0.7.3
36+
GITHUB_CACHE_PATH: /tmp/cirque-cache
37+
38+
runs-on: ubuntu-latest
39+
if: github.actor != 'restyled-io[bot]'
40+
41+
# need to run with privilege, which isn't supported by job.XXX.contaner
42+
# https://github.com/actions/container-action/issues/2
43+
# container:
44+
# image: connectedhomeip/chip-build-cirque:0.7.3
45+
# volumes:
46+
# - "/tmp:/tmp"
47+
# - "/dev/pts:/dev/pts"
48+
# env:
49+
# LOG_DIR: /tmp/cirque_test_output/
50+
# CLEANUP_DOCKER_FOR_CI: 1
51+
# options: "--privileged"
52+
53+
steps:
54+
- name: Checkout
55+
uses: actions/checkout@v3
56+
- name: Checkout submodules
57+
uses: ./.github/actions/checkout-submodules
58+
with:
59+
platform: linux
60+
61+
- name: Bootstrap Cache
62+
uses: ./.github/actions/bootstrap-cache
63+
- name: Bootstrap
64+
run: |
65+
integrations/docker/images/chip-build-cirque/run.sh \
66+
-- sh -c " \
67+
git config --global --add safe.directory '*' \
68+
&& bash scripts/bootstrap.sh \
69+
&& chown -R $(id -u):$(id -g) .environment \
70+
"
71+
72+
- name: Get Cirque Bootstrap cache key
73+
id: cirque-bootstrap-cache-key
74+
run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
75+
- uses: Wandalen/wretry.action@v1.3.0
76+
name: Cirque Bootstrap cache
77+
if: ${{ !env.ACT }}
78+
continue-on-error: true
79+
timeout-minutes: 10
80+
with:
81+
action: buildjet/cache@v3
82+
attempt_limit: 3
83+
attempt_delay: 2000
84+
with: |
85+
key: ${{ runner.os }}-cirque-${{ steps.cirque-bootstrap-cache-key.outputs.val }}
86+
restore-keys: ${{ runner.os }}-cirque-
87+
path: ${{ env.GITHUB_CACHE_PATH }}
88+
- name: Cirque Bootstrap
89+
run: |
90+
integrations/docker/images/chip-build-cirque/run.sh \
91+
--env GITHUB_ACTION_RUN=1 \
92+
--env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
93+
--volume /tmp:/tmp \
94+
-- scripts/tests/cirque_tests.sh bootstrap
95+
96+
- name: Artifact suffix
97+
id: outsuffix
98+
uses: haya14busa/action-cond@v1
99+
if: ${{ !env.ACT }}
100+
with:
101+
cond: ${{ github.event.pull_request.number == '' }}
102+
if_true: "${{ github.sha }}"
103+
if_false: "pull-${{ github.event.pull_request.number }}"
104+
- name: Build Binaries
105+
run: |
106+
integrations/docker/images/chip-build-cirque/run.sh \
107+
-- sh -c " \
108+
git config --global --add safe.directory '*' \
109+
&& scripts/build/gn_gen_cirque.sh \
110+
"
111+
- name: Run Tests
112+
run: |
113+
integrations/docker/images/chip-build-cirque/run.sh \
114+
--env LOG_DIR=/tmp/cirque_test_output \
115+
--env CLEANUP_DOCKER_FOR_CI=1 \
116+
--env GITHUB_ACTION_RUN=1 \
117+
--privileged \
118+
--volume /tmp:/tmp \
119+
--volume /dev/pts:/dev/pts \
120+
-- scripts/tests/cirque_tests.sh run_all_tests
121+
122+
- name: Uploading Binaries
123+
uses: actions/upload-artifact@v3
124+
if: ${{ always() && !env.ACT }}
125+
with:
126+
name: cirque_log-${{steps.outsuffix.outputs.value}}-logs
127+
path: /tmp/cirque_test_output/

0 commit comments

Comments
 (0)