Skip to content

Commit 481445d

Browse files
j-ororkej-ororke
authored
Merge branch 'master' into test_CADMIN_1_11
2 parents 70af987 + 6ba9655 commit 481445d

File tree

2,207 files changed

+138655
-32711
lines changed

Some content is hidden

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

2,207 files changed

+138655
-32711
lines changed

‎.github/.wordlist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ DevKitM
402402
devtype
403403
df
404404
dfe
405+
DFILE
405406
dfu
406407
DgDxsfHx
407408
dhclient
@@ -649,6 +650,7 @@ href
649650
HSM
650651
hsm
651652
HTTPS
653+
Humidistat
652654
HW
653655
hwadr
654656
HydrogenConcentrationMeasurement
@@ -1354,6 +1356,7 @@ SVR
13541356
SWD
13551357
SWU
13561358
symlinks
1359+
sysbuild
13571360
sysconfdir
13581361
SysConfig
13591362
sysctl

‎.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/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

‎.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:66
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:66
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:66
460460
volumes:
461461
- "/:/runner-root-volume"
462462
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+4-4
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:66
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:67
6060
options: --user root
6161

6262
steps:
@@ -77,7 +77,7 @@ jobs:
7777
if: github.actor != 'restyled-io[bot]'
7878

7979
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:54
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:66
8181
options: --user root
8282

8383
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:66
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/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
9696
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
9797
--target darwin-x64-rvc-${BUILD_VARIANT} \
98+
--target darwin-x64-network-manager-${BUILD_VARIANT} \
9899
build \
99100
--copy-artifacts-to objdir-clone \
100101
"
@@ -116,6 +117,7 @@ jobs:
116117
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
117118
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
118119
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
120+
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
119121
"
120122
- name: Run OTA Test
121123
run: |

‎.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:66
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:66
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:66
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:67
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:67
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:66
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:66
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

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

+11-8
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:66
4040

4141
steps:
4242
- name: Checkout
@@ -71,13 +71,16 @@ jobs:
7171
"python3 ./scripts/tests/run_tv_casting_test.py"
7272
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
7373

74-
- name:
75-
Test casting from Linux tv-casting-app to Linux tv-app -
76-
Commissioner Generated Passcode
77-
run: |
78-
./scripts/run_in_build_env.sh \
79-
"python3 ./scripts/tests/run_tv_casting_test.py --commissioner-generated-passcode=True"
80-
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
74+
# TODO: this test is flaky and was disabled
75+
# https://github.com/project-chip/connectedhomeip/issues/34598
76+
#
77+
# - name:
78+
# Test casting from Linux tv-casting-app to Linux tv-app -
79+
# Commissioner Generated Passcode
80+
# run: |
81+
# ./scripts/run_in_build_env.sh \
82+
# "python3 ./scripts/tests/run_tv_casting_test.py --commissioner-generated-passcode=True"
83+
# timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
8184

8285
- name: Uploading Size Reports
8386
uses: ./.github/actions/upload-size-reports

‎.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:66
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:66
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

0 commit comments

Comments
 (0)