Skip to content

Commit 21339eb

Browse files
vatsalghelani-csavatsalghelani-csa
committed
Merge conflict resolution
2 parents 0764957 + 66847c6 commit 21339eb

File tree

729 files changed

+34233
-14991
lines changed

Some content is hidden

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

729 files changed

+34233
-14991
lines changed

‎.github/actions/bootstrap-cache/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
attempt_limit: 3
1212
attempt_delay: 2000
1313
with: |
14-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
14+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
1515
path: |
1616
.environment
1717
build_overrides/pigweed_environment.gni

‎.github/actions/bootstrap/action.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ runs:
2626
# because the bootstrapped Pigweed environment contains absolute paths.
2727
echo "Calculating bootstrap cache key for '$PWD'"
2828
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
29-
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
29+
case "$RUNNER_OS" in
30+
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
31+
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
32+
esac
33+
PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
34+
FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
3035
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
3136
3237
# Split caches across backends

‎.github/workflows/bloat_check.yaml

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

3636
container:
37-
image: ghcr.io/project-chip/chip-build:54
37+
image: ghcr.io/project-chip/chip-build:65
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:54
45+
image: ghcr.io/project-chip/chip-build:65
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -456,7 +456,7 @@ jobs:
456456
if: github.actor != 'restyled-io[bot]'
457457

458458
container:
459-
image: ghcr.io/project-chip/chip-build:54
459+
image: ghcr.io/project-chip/chip-build:65
460460
volumes:
461461
- "/:/runner-root-volume"
462462
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:54
38+
image: ghcr.io/project-chip/chip-build:65
3939
options: --user root
4040

4141
steps:
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:54
59+
image: ghcr.io/project-chip/chip-build-esp32:65
6060
options: --user root
6161

6262
steps:
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:57
101+
image: ghcr.io/project-chip/chip-build-telink:65
102102
options: --user root
103103

104104
steps:

‎.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# need to run with privilege, which isn't supported by job.XXX.contaner
4343
# https://github.com/actions/container-action/issues/2
4444
# container:
45-
# image: ghcr.io/project-chip/chip-build-cirque:54
45+
# image: ghcr.io/project-chip/chip-build-cirque:<VERSION_HERE>
4646
# volumes:
4747
# - "/tmp:/tmp"
4848
# - "/dev/pts:/dev/pts"

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:54
84+
image: ghcr.io/project-chip/chip-build-doxygen:65
8585

8686
if: github.actor != 'restyled-io[bot]'
8787

‎.github/workflows/examples-asr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-asr:54
39+
image: ghcr.io/project-chip/chip-build-asr:65
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-efr32.yaml

+1-1
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-efr32:56
43+
image: ghcr.io/project-chip/chip-build-efr32:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-esp32:54
39+
image: ghcr.io/project-chip/chip-build-esp32:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:54
129+
image: ghcr.io/project-chip/chip-build-esp32:65
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-linux-arm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-crosscompile:54
39+
image: ghcr.io/project-chip/chip-build-crosscompile:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-linux-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:54
39+
image: ghcr.io/project-chip/chip-build:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-linux-tv-casting-app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:54
39+
image: ghcr.io/project-chip/chip-build:65
4040

4141
steps:
4242
- name: Checkout

‎.github/workflows/examples-mbed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-mbed-os:54
45+
image: ghcr.io/project-chip/chip-build-mbed-os:65
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848

‎.github/workflows/examples-mw320.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build:54
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-nuttx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build-nuttx:54
38+
image: ghcr.io/project-chip/chip-build-nuttx:65
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-nxp.yaml

+28-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-k32w:54
42+
image: ghcr.io/project-chip/chip-build-k32w:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:
@@ -96,3 +96,30 @@ jobs:
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
100+
zephyr:
101+
name: ZEPHYR_RW61X
102+
103+
runs-on: ubuntu-latest
104+
if: github.actor != 'restyled-io[bot]'
105+
106+
container:
107+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:65
108+
109+
steps:
110+
- name: Checkout
111+
uses: actions/checkout@v4
112+
- name: Checkout submodules & Bootstrap
113+
uses: ./.github/actions/checkout-submodules-and-bootstrap
114+
with:
115+
platform: nxp
116+
117+
- name: Build RW61x Zephyr examples
118+
run: |
119+
scripts/run_in_build_env.sh "\
120+
./scripts/build/build_examples.py \
121+
--target nxp-rw61x-zephyr-all-clusters \
122+
--target nxp-rw61x-zephyr-thermostat \
123+
--target nxp-rw61x-zephyr-laundry-washer-factory \
124+
build \
125+
"

‎.github/workflows/examples-openiotsdk.yaml

+1-1
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-openiotsdk:54
43+
image: ghcr.io/project-chip/chip-build-openiotsdk:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
options: --privileged

‎.github/workflows/examples-qpg.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build:54
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-rw61x.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build-rw61x:54
42+
image: ghcr.io/project-chip/chip-build-rw61x:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-stm32.yaml

+1-1
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:54
43+
image: ghcr.io/project-chip/chip-build:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-telink.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-telink:57
41+
image: ghcr.io/project-chip/chip-build-telink:65
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444

‎.github/workflows/examples-tizen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-tizen:54
39+
image: ghcr.io/project-chip/chip-build-tizen:65
4040
options: --user root
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"

‎.github/workflows/full-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-android:54
41+
image: ghcr.io/project-chip/chip-build-android:65
4242
volumes:
4343
- "/tmp/log_output:/tmp/test_logs"
4444

‎.github/workflows/fuzzing-build.yaml

+1-1
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:54
36+
image: ghcr.io/project-chip/chip-build:65
3737
volumes:
3838
- "/tmp/log_output:/tmp/test_logs"
3939

‎.github/workflows/java-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-java:54
45+
image: ghcr.io/project-chip/chip-build-java:65
4646
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
4747
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
4848

‎.github/workflows/lint.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:54
38+
image: ghcr.io/project-chip/chip-build:65
3939

4040
steps:
4141
- name: Checkout
@@ -296,6 +296,7 @@ jobs:
296296
':(exclude)src/app/util/attribute-table.cpp' \
297297
':(exclude)src/app/util/attribute-table.h' \
298298
':(exclude)src/app/util/ember-compatibility-functions.cpp' \
299+
':(exclude)src/app/util/mock/CodegenEmberMocks.cpp' \
299300
':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' \
300301
':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' \
301302
&& exit 1 || exit 0

‎.github/workflows/minimal-build.yaml

+2-2
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-minimal:54
36+
image: ghcr.io/project-chip/chip-build-minimal:65
3737

3838
steps:
3939
- name: Checkout
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656

5757
container:
58-
image: ghcr.io/project-chip/chip-build-minimal:54
58+
image: ghcr.io/project-chip/chip-build-minimal:65
5959

6060
steps:
6161
- name: Checkout

‎.github/workflows/qemu.yaml

+1-1
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-esp32-qemu:54
43+
image: ghcr.io/project-chip/chip-build-esp32-qemu:65
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646

‎.github/workflows/release_artifacts.yaml

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

3434
container:
35-
image: ghcr.io/project-chip/chip-build-esp32:54
35+
image: ghcr.io/project-chip/chip-build-esp32:65
3636

3737
steps:
3838
- name: Checkout

‎.github/workflows/smoketest-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-android:54
40+
image: ghcr.io/project-chip/chip-build-android:65
4141
volumes:
4242
- "/:/runner-root-volume"
4343
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/tests.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ jobs:
445445
runs-on: ubuntu-latest
446446

447447
container:
448-
image: ghcr.io/project-chip/chip-build:54
448+
image: ghcr.io/project-chip/chip-build:65
449449
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
450450
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
451451

@@ -497,13 +497,15 @@ jobs:
497497
mkdir -p out/trace_data
498498
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/controller/python/test/test_scripts/mobile-device-test.py'
499499
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/execute_python_tests.py --env-file /tmp/test_env.yaml --search-directory src/python_testing'
500-
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
501500
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
502501
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
503502
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
504503
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
505504
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
505+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
506+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
506507
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
508+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'
507509
508510
- name: Uploading core files
509511
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)