Skip to content

Commit 1099cea

Browse files
marktrayermarktrayer
authored
Merge branch 'master' into pr/webrtc/ice
2 parents 15e379e + 876fcf5 commit 1099cea

File tree

165 files changed

+2926
-1026
lines changed

Some content is hidden

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

165 files changed

+2926
-1026
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ jobs:
423423
424424
build_darwin:
425425
name: Build on Darwin (clang, simulated)
426-
runs-on: macos-13
426+
runs-on: macos-14
427427
if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
428428

429429
steps:

‎.github/workflows/cert_test_checks.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
uses: actions/checkout@v5
3535
with:
3636
fetch-depth: 0
37+
- name: Install dependencies
38+
run: |
39+
pip3 install --break-system-packages sdbus
3740
- name: Run checks
3841
run: |
3942
python3 scripts/tests/matter_yaml_linter.py

‎.github/workflows/darwin-tests.yaml‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ jobs:
3838

3939
strategy:
4040
matrix:
41-
build_variant: [no-ble-no-shell-asan-clang]
41+
include:
42+
- os: macos-14
43+
arch: arm64 # observed, not configured
44+
dry-run: true
45+
build_variant: no-ble-no-shell-asan-clang
46+
chip_tool: ""
4247
env:
4348
BUILD_VARIANT: ${{matrix.build_variant}}
4449

@@ -52,7 +57,7 @@ jobs:
5257
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
5358

5459
if: github.actor != 'restyled-io[bot]'
55-
runs-on: macos-13
60+
runs-on: ${{matrix.os}}
5661

5762
steps:
5863
- name: Checkout
@@ -89,19 +94,19 @@ jobs:
8994
run: |
9095
./scripts/run_in_build_env.sh \
9196
"./scripts/build/build_examples.py \
92-
--target darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
93-
--target darwin-x64-all-clusters-${BUILD_VARIANT} \
94-
--target darwin-x64-lock-${BUILD_VARIANT} \
95-
--target darwin-x64-ota-provider-${BUILD_VARIANT} \
96-
--target darwin-x64-ota-requestor-${BUILD_VARIANT} \
97-
--target darwin-x64-tv-app-${BUILD_VARIANT} \
98-
--target darwin-x64-bridge-${BUILD_VARIANT} \
99-
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
100-
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
101-
--target darwin-x64-rvc-${BUILD_VARIANT} \
102-
--target darwin-x64-network-manager-${BUILD_VARIANT} \
103-
--target darwin-x64-energy-gateway-${BUILD_VARIANT} \
104-
--target darwin-x64-energy-management-${BUILD_VARIANT} \
97+
--target darwin-${{matrix.arch}}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
98+
--target darwin-${{matrix.arch}}-all-clusters-${BUILD_VARIANT} \
99+
--target darwin-${{matrix.arch}}-lock-${BUILD_VARIANT} \
100+
--target darwin-${{matrix.arch}}-ota-provider-${BUILD_VARIANT} \
101+
--target darwin-${{matrix.arch}}-ota-requestor-${BUILD_VARIANT} \
102+
--target darwin-${{matrix.arch}}-tv-app-${BUILD_VARIANT} \
103+
--target darwin-${{matrix.arch}}-bridge-${BUILD_VARIANT} \
104+
--target darwin-${{matrix.arch}}-lit-icd-${BUILD_VARIANT} \
105+
--target darwin-${{matrix.arch}}-microwave-oven-${BUILD_VARIANT} \
106+
--target darwin-${{matrix.arch}}-rvc-${BUILD_VARIANT} \
107+
--target darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT} \
108+
--target darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT} \
109+
--target darwin-${{matrix.arch}}-energy-management-${BUILD_VARIANT} \
105110
build \
106111
--copy-artifacts-to objdir-clone \
107112
"
@@ -110,30 +115,30 @@ jobs:
110115
./scripts/run_in_build_env.sh \
111116
"./scripts/tests/run_test_suite.py \
112117
--runner darwin_framework_tool_python \
113-
--chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
118+
--chip-tool ./out/darwin-${{matrix.arch}}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
114119
--target-skip-glob '{TestAccessControlConstraints}' \
115120
run \
116121
--iterations 1 \
117122
--test-timeout-seconds 120 \
118-
--all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
119-
--lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
120-
--ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
121-
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
122-
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
123-
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
124-
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
125-
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
126-
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
127-
--energy-gateway-app ./out/darwin-x64-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
128-
--energy-management-app ./out/darwin-x64-energy-management-${BUILD_VARIANT}/chip-energy-management-app \
123+
--all-clusters-app ./out/darwin-${{matrix.arch}}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
124+
--lock-app ./out/darwin-${{matrix.arch}}-lock-${BUILD_VARIANT}/chip-lock-app \
125+
--ota-provider-app ./out/darwin-${{matrix.arch}}-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
126+
--ota-requestor-app ./out/darwin-${{matrix.arch}}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
127+
--tv-app ./out/darwin-${{matrix.arch}}-tv-app-${BUILD_VARIANT}/chip-tv-app \
128+
--bridge-app ./out/darwin-${{matrix.arch}}-bridge-${BUILD_VARIANT}/chip-bridge-app \
129+
--microwave-oven-app ./out/darwin-${{matrix.arch}}-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
130+
--rvc-app ./out/darwin-${{matrix.arch}}-rvc-${BUILD_VARIANT}/chip-rvc-app \
131+
--network-manager-app ./out/darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
132+
--energy-gateway-app ./out/darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
133+
--energy-management-app ./out/darwin-${{matrix.arch}}-energy-management-${BUILD_VARIANT}/chip-energy-management-app \
129134
"
130135
- name: Run OTA Test
131136
run: |
132137
./scripts/run_in_build_env.sh \
133138
"./scripts/tests/run_darwin_framework_ota_test.py \
134139
run \
135-
--darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
136-
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
140+
--darwin-framework-tool ./out/darwin-${{matrix.arch}}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
141+
--ota-requestor-app ./out/darwin-${{matrix.arch}}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
137142
--ota-data-file /tmp/rawImage \
138143
--ota-image-file /tmp/otaImage \
139144
--ota-destination-file /tmp/downloadedImage \
@@ -158,7 +163,7 @@ jobs:
158163
if: ${{ failure() && !env.ACT }}
159164
with:
160165
name: framework-build-log-darwin-${BUILD_VARIANT_FRAMEWORK_TOOL}
161-
path: out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
166+
path: out/darwin-${{matrix.arch}}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
162167
- name: Uploading objdir for debugging
163168
uses: actions/upload-artifact@v4
164169
if: ${{ failure() && !env.ACT }}

‎.github/workflows/darwin.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ jobs:
3737
framework:
3838
name: Build framework
3939
if: github.actor != 'restyled-io[bot]'
40-
runs-on: macos-13
40+
4141
strategy:
4242
matrix:
43+
os: [ macos-14 ]
4344
options: # We don't need a full matrix
4445
- flavor: macos-release
4546
arguments: -sdk macosx -configuration Release
@@ -49,6 +50,7 @@ jobs:
4950
arguments: -sdk appletvos -configuration Debug
5051
- flavor: watchos-debug
5152
arguments: -sdk watchos -configuration Debug
53+
runs-on: ${{ matrix.os }}
5254
steps:
5355
- name: Checkout
5456
uses: actions/checkout@v5
@@ -79,9 +81,10 @@ jobs:
7981
name: Run framework tests
8082
if: github.actor != 'restyled-io[bot]'
8183
needs: [framework] # serialize to avoid running to many parallel macos runners
82-
runs-on: macos-13
84+
runs-on: ${{ matrix.os }}
8385
strategy:
8486
matrix:
87+
os: [ macos-14 ]
8588
options: # We don't need a full matrix
8689
- flavor: asan
8790
arguments:
@@ -110,12 +113,12 @@ jobs:
110113
mkdir -p /tmp/darwin/framework-tests
111114
112115
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
113-
116+
echo "Quiet work in progress - artifacts `darwin-tests.log` and `darwin-tests-err.log` will be output."
114117
xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
115-
-resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
116-
-sdk macosx ${{ matrix.options.arguments }} \
117-
GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
118-
> >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
118+
-resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
119+
-sdk macosx ${{ matrix.options.arguments }} \
120+
GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
121+
> /tmp/darwin/framework-tests/darwin-tests.log 2> /tmp/darwin/framework-tests/darwin-tests-err.log
119122
- name: Generate Summary
120123
if: always()
121124
working-directory: /tmp

‎.github/workflows/fuzzing-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
build_darwin_fuzzing:
7070
name: Build on Darwin
71-
runs-on: macos-13
71+
runs-on: macos-14
7272
if: github.actor != 'restyled-io[bot]'
7373

7474
steps:

0 commit comments

Comments
 (0)