Skip to content

Commit d39792c

Browse files
bzbarsky-applebzbarsky-apple
committed
Switch to macos-14 for the Darwin runners.
macos-14 runners are ARM, and should be much faster than the macos-13 runners.
1 parent 3136753 commit d39792c

File tree

8 files changed

+61
-58
lines changed

8 files changed

+61
-58
lines changed

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ jobs:
375375
376376
build_darwin:
377377
name: Build on Darwin (clang, python_lib, simulated)
378-
runs-on: macos-13
378+
runs-on: macos-14
379379
if: github.actor != 'restyled-io[bot]'
380380

381381
steps:

‎.github/workflows/darwin-tests.yaml

+26-25
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ jobs:
4949
# it.
5050
BUILD_VARIANT_FRAMEWORK_TOOL: no-ble
5151
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
52+
DARWIN_ARCH: "arm64"
5253

5354
if: github.actor != 'restyled-io[bot]'
54-
runs-on: macos-13
55+
runs-on: macos-14
5556

5657
steps:
5758
- name: Checkout
@@ -85,17 +86,17 @@ jobs:
8586
run: |
8687
./scripts/run_in_build_env.sh \
8788
"./scripts/build/build_examples.py \
88-
--target darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
89-
--target darwin-x64-all-clusters-${BUILD_VARIANT} \
90-
--target darwin-x64-lock-${BUILD_VARIANT} \
91-
--target darwin-x64-ota-provider-${BUILD_VARIANT} \
92-
--target darwin-x64-ota-requestor-${BUILD_VARIANT} \
93-
--target darwin-x64-tv-app-${BUILD_VARIANT} \
94-
--target darwin-x64-bridge-${BUILD_VARIANT} \
95-
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
96-
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
97-
--target darwin-x64-rvc-${BUILD_VARIANT} \
98-
--target darwin-x64-network-manager-${BUILD_VARIANT} \
89+
--target darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
90+
--target darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT} \
91+
--target darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT} \
92+
--target darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT} \
93+
--target darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT} \
94+
--target darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT} \
95+
--target darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT} \
96+
--target darwin-${DARWIN_ARCH}-lit-icd-${BUILD_VARIANT} \
97+
--target darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT} \
98+
--target darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT} \
99+
--target darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT} \
99100
build \
100101
--copy-artifacts-to objdir-clone \
101102
"
@@ -104,28 +105,28 @@ jobs:
104105
./scripts/run_in_build_env.sh \
105106
"./scripts/tests/run_test_suite.py \
106107
--runner darwin_framework_tool_python \
107-
--chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
108+
--chip-tool ./out/darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
108109
--target-skip-glob '{TestAccessControlConstraints}' \
109110
run \
110111
--iterations 1 \
111112
--test-timeout-seconds 120 \
112-
--all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
113-
--lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
114-
--ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
115-
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
116-
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
117-
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
118-
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
119-
--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 \
113+
--all-clusters-app ./out/darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
114+
--lock-app ./out/darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT}/chip-lock-app \
115+
--ota-provider-app ./out/darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
116+
--ota-requestor-app ./out/darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
117+
--tv-app ./out/darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT}/chip-tv-app \
118+
--bridge-app ./out/darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT}/chip-bridge-app \
119+
--microwave-oven-app ./out/darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
120+
--rvc-app ./out/darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT}/chip-rvc-app \
121+
--network-manager-app ./out/darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
121122
"
122123
- name: Run OTA Test
123124
run: |
124125
./scripts/run_in_build_env.sh \
125126
"./scripts/tests/run_darwin_framework_ota_test.py \
126127
run \
127-
--darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
128-
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
128+
--darwin-framework-tool ./out/darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
129+
--ota-requestor-app ./out/darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
129130
--ota-data-file /tmp/rawImage \
130131
--ota-image-file /tmp/otaImage \
131132
--ota-destination-file /tmp/downloadedImage \
@@ -150,7 +151,7 @@ jobs:
150151
if: ${{ failure() && !env.ACT }}
151152
with:
152153
name: framework-build-log-darwin-${BUILD_VARIANT_FRAMEWORK_TOOL}
153-
path: out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
154+
path: out/darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
154155
- name: Uploading objdir for debugging
155156
uses: actions/upload-artifact@v4
156157
if: ${{ failure() && !env.ACT }}

‎.github/workflows/darwin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
framework:
3737
name: Build framework
3838
if: github.actor != 'restyled-io[bot]'
39-
runs-on: macos-13
39+
runs-on: macos-14
4040
strategy:
4141
matrix:
4242
options: # We don't need a full matrix
@@ -73,7 +73,7 @@ jobs:
7373
name: Run framework tests
7474
if: github.actor != 'restyled-io[bot]'
7575
needs: [framework] # serialize to avoid running to many parallel macos runners
76-
runs-on: macos-13
76+
runs-on: macos-14
7777
strategy:
7878
matrix:
7979
options: # We don't need a full matrix

‎.github/workflows/example-tv-casting-darwin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
tv-casting-bridge:
3737
name: Build TV Casting Bridge example
3838
if: github.actor != 'restyled-io[bot]'
39-
runs-on: macos-13
39+
runs-on: macos-14
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v4

‎.github/workflows/fuzzing-build.yaml

+2-2
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:
@@ -87,7 +87,7 @@ jobs:
8787
run: |
8888
./scripts/run_in_build_env.sh \
8989
"./scripts/build/build_examples.py \
90-
--target darwin-x64-all-clusters-no-ble-asan-libfuzzer-clang \
90+
--target darwin-arm64-all-clusters-no-ble-asan-libfuzzer-clang \
9191
build \
9292
--copy-artifacts-to objdir-clone \
9393
"

‎.github/workflows/tests.yaml

+27-26
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,10 @@ jobs:
338338
CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
339339
TSAN_OPTIONS: "halt_on_error=1"
340340
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
341+
DARWIN_ARCH: "arm64"
341342

342343
if: github.actor != 'restyled-io[bot]'
343-
runs-on: macos-13
344+
runs-on: macos-14
344345

345346
steps:
346347
- name: Checkout
@@ -366,17 +367,17 @@ jobs:
366367
run: |
367368
./scripts/run_in_build_env.sh \
368369
"./scripts/build/build_examples.py \
369-
--target darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \
370-
--target darwin-x64-all-clusters-${BUILD_VARIANT} \
371-
--target darwin-x64-lock-${BUILD_VARIANT} \
372-
--target darwin-x64-ota-provider-${BUILD_VARIANT} \
373-
--target darwin-x64-ota-requestor-${BUILD_VARIANT} \
374-
--target darwin-x64-tv-app-${BUILD_VARIANT} \
375-
--target darwin-x64-bridge-${BUILD_VARIANT} \
376-
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
377-
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
378-
--target darwin-x64-rvc-${BUILD_VARIANT} \
379-
--target darwin-x64-network-manager-${BUILD_VARIANT} \
370+
--target darwin-${DARWIN_ARCH}-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \
371+
--target darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT} \
372+
--target darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT} \
373+
--target darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT} \
374+
--target darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT} \
375+
--target darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT} \
376+
--target darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT} \
377+
--target darwin-${DARWIN_ARCH}-lit-icd-${BUILD_VARIANT} \
378+
--target darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT} \
379+
--target darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT} \
380+
--target darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT} \
380381
build \
381382
--copy-artifacts-to objdir-clone \
382383
"
@@ -386,21 +387,21 @@ jobs:
386387
./scripts/run_in_build_env.sh \
387388
"./scripts/tests/run_test_suite.py \
388389
--runner chip_tool_python \
389-
--chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
390+
--chip-tool ./out/darwin-${DARWIN_ARCH}-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
390391
--target-skip-glob '{Test_TC_DGTHREAD_2_1,Test_TC_DGTHREAD_2_2,Test_TC_DGTHREAD_2_3,Test_TC_DGTHREAD_2_4}' \
391392
run \
392393
--iterations 1 \
393394
--test-timeout-seconds 120 \
394-
--all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
395-
--lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
396-
--ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
397-
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
398-
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
399-
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
400-
--lit-icd-app ./out/darwin-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
401-
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
402-
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
403-
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
395+
--all-clusters-app ./out/darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
396+
--lock-app ./out/darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT}/chip-lock-app \
397+
--ota-provider-app ./out/darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
398+
--ota-requestor-app ./out/darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
399+
--tv-app ./out/darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT}/chip-tv-app \
400+
--bridge-app ./out/darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT}/chip-bridge-app \
401+
--lit-icd-app ./out/darwin-${DARWIN_ARCH}-lit-icd-${BUILD_VARIANT}/lit-icd-app \
402+
--microwave-oven-app ./out/darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
403+
--rvc-app ./out/darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT}/chip-rvc-app \
404+
--network-manager-app ./out/darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
404405
"
405406
406407
- name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -409,13 +410,13 @@ jobs:
409410
"./scripts/tests/run_test_suite.py \
410411
--runner chip_tool_python \
411412
--include-tags PURPOSEFUL_FAILURE \
412-
--chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
413+
--chip-tool ./out/darwin-${DARWIN_ARCH}-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
413414
run \
414415
--iterations 1 \
415416
--expected-failures 3 \
416417
--keep-going \
417418
--test-timeout-seconds 120 \
418-
--all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
419+
--all-clusters-app ./out/darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
419420
"
420421
421422
- name: Uploading core files
@@ -559,7 +560,7 @@ jobs:
559560
TSAN_OPTIONS: "halt_on_error=1"
560561

561562
if: github.actor != 'restyled-io[bot]' && false
562-
runs-on: macos-13
563+
runs-on: macos-14
563564

564565
steps:
565566
- name: Checkout

‎src/app/tests/suites/TestSystemCommands.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ config:
1818
nodeId: 0x12344321
1919
cluster: "SystemCommands"
2020
endpoint: 0
21+
timeout: 180
2122
payload:
2223
type: char_string
2324
defaultValue: "MT:-24J0IX4122-.548G00" # This value needs to be generated

‎src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ - (void)test004_Subscribe
827827
}];
828828

829829
// Wait for report
830-
[self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
830+
[self waitForExpectationsWithTimeout:kTimeoutInSeconds*5 handler:nil];
831831

832832
XCTestExpectation * clearExpectation = [self expectationWithDescription:@"report handlers deregistered"];
833833
[device deregisterReportHandlersWithQueue:queue

0 commit comments

Comments
 (0)