diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e7e5073ec54b02..e75f4f84c266a6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -375,7 +375,7 @@ jobs: build_darwin: name: Build on Darwin (clang, python_lib, simulated) - runs-on: macos-13 + runs-on: macos-14 if: github.actor != 'restyled-io[bot]' steps: diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml index 815293204b09de..3319d1fca4b059 100644 --- a/.github/workflows/darwin-tests.yaml +++ b/.github/workflows/darwin-tests.yaml @@ -49,9 +49,10 @@ jobs: # it. BUILD_VARIANT_FRAMEWORK_TOOL: no-ble LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt + DARWIN_ARCH: "arm64" if: github.actor != 'restyled-io[bot]' - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout @@ -85,17 +86,17 @@ jobs: run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ - --target darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \ - --target darwin-x64-all-clusters-${BUILD_VARIANT} \ - --target darwin-x64-lock-${BUILD_VARIANT} \ - --target darwin-x64-ota-provider-${BUILD_VARIANT} \ - --target darwin-x64-ota-requestor-${BUILD_VARIANT} \ - --target darwin-x64-tv-app-${BUILD_VARIANT} \ - --target darwin-x64-bridge-${BUILD_VARIANT} \ - --target darwin-x64-lit-icd-${BUILD_VARIANT} \ - --target darwin-x64-microwave-oven-${BUILD_VARIANT} \ - --target darwin-x64-rvc-${BUILD_VARIANT} \ - --target darwin-x64-network-manager-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \ + --target darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-lit-icd-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT} \ build \ --copy-artifacts-to objdir-clone \ " @@ -104,28 +105,28 @@ jobs: ./scripts/run_in_build_env.sh \ "./scripts/tests/run_test_suite.py \ --runner darwin_framework_tool_python \ - --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \ + --chip-tool ./out/darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \ --target-skip-glob '{TestAccessControlConstraints}' \ run \ --iterations 1 \ --test-timeout-seconds 120 \ - --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ - --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \ - --ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \ - --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \ - --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \ - --bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \ - --microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \ - --rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \ - --network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \ + --all-clusters-app ./out/darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ + --lock-app ./out/darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT}/chip-lock-app \ + --ota-provider-app ./out/darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \ + --ota-requestor-app ./out/darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \ + --tv-app ./out/darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT}/chip-tv-app \ + --bridge-app ./out/darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT}/chip-bridge-app \ + --microwave-oven-app ./out/darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \ + --rvc-app ./out/darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT}/chip-rvc-app \ + --network-manager-app ./out/darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \ " - name: Run OTA Test run: | ./scripts/run_in_build_env.sh \ "./scripts/tests/run_darwin_framework_ota_test.py \ run \ - --darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \ - --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \ + --darwin-framework-tool ./out/darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \ + --ota-requestor-app ./out/darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \ --ota-data-file /tmp/rawImage \ --ota-image-file /tmp/otaImage \ --ota-destination-file /tmp/downloadedImage \ @@ -150,7 +151,7 @@ jobs: if: ${{ failure() && !env.ACT }} with: name: framework-build-log-darwin-${BUILD_VARIANT_FRAMEWORK_TOOL} - path: out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log + path: out/darwin-${DARWIN_ARCH}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log - name: Uploading objdir for debugging uses: actions/upload-artifact@v4 if: ${{ failure() && !env.ACT }} diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index 9eeac9118ef9d3..fa9e6144497414 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -36,7 +36,7 @@ jobs: framework: name: Build framework if: github.actor != 'restyled-io[bot]' - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: options: # We don't need a full matrix @@ -73,7 +73,7 @@ jobs: name: Run framework tests if: github.actor != 'restyled-io[bot]' needs: [framework] # serialize to avoid running to many parallel macos runners - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: options: # We don't need a full matrix diff --git a/.github/workflows/example-tv-casting-darwin.yaml b/.github/workflows/example-tv-casting-darwin.yaml index d9d9ef8f37cee9..d8b7b7895e250e 100644 --- a/.github/workflows/example-tv-casting-darwin.yaml +++ b/.github/workflows/example-tv-casting-darwin.yaml @@ -36,7 +36,7 @@ jobs: tv-casting-bridge: name: Build TV Casting Bridge example if: github.actor != 'restyled-io[bot]' - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index c70d750554c53e..50c47bb3b2fabf 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -68,7 +68,7 @@ jobs: build_darwin_fuzzing: name: Build on Darwin - runs-on: macos-13 + runs-on: macos-14 if: github.actor != 'restyled-io[bot]' steps: @@ -87,7 +87,7 @@ jobs: run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ - --target darwin-x64-all-clusters-no-ble-asan-libfuzzer-clang \ + --target darwin-arm64-all-clusters-no-ble-asan-libfuzzer-clang \ build \ --copy-artifacts-to objdir-clone \ " diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d14d188a2fb6e4..ddba0412a6a437 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -338,9 +338,10 @@ jobs: CHIP_TOOL_VARIANT: ${{matrix.chip_tool}} TSAN_OPTIONS: "halt_on_error=1" LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt + DARWIN_ARCH: "arm64" if: github.actor != 'restyled-io[bot]' - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout @@ -366,17 +367,17 @@ jobs: run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ - --target darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \ - --target darwin-x64-all-clusters-${BUILD_VARIANT} \ - --target darwin-x64-lock-${BUILD_VARIANT} \ - --target darwin-x64-ota-provider-${BUILD_VARIANT} \ - --target darwin-x64-ota-requestor-${BUILD_VARIANT} \ - --target darwin-x64-tv-app-${BUILD_VARIANT} \ - --target darwin-x64-bridge-${BUILD_VARIANT} \ - --target darwin-x64-lit-icd-${BUILD_VARIANT} \ - --target darwin-x64-microwave-oven-${BUILD_VARIANT} \ - --target darwin-x64-rvc-${BUILD_VARIANT} \ - --target darwin-x64-network-manager-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-lit-icd-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT} \ + --target darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT} \ build \ --copy-artifacts-to objdir-clone \ " @@ -386,21 +387,21 @@ jobs: ./scripts/run_in_build_env.sh \ "./scripts/tests/run_test_suite.py \ --runner chip_tool_python \ - --chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \ + --chip-tool ./out/darwin-${DARWIN_ARCH}-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \ --target-skip-glob '{Test_TC_DGTHREAD_2_1,Test_TC_DGTHREAD_2_2,Test_TC_DGTHREAD_2_3,Test_TC_DGTHREAD_2_4}' \ run \ --iterations 1 \ --test-timeout-seconds 120 \ - --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ - --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \ - --ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \ - --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \ - --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \ - --bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \ - --lit-icd-app ./out/darwin-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \ - --microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \ - --rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \ - --network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \ + --all-clusters-app ./out/darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ + --lock-app ./out/darwin-${DARWIN_ARCH}-lock-${BUILD_VARIANT}/chip-lock-app \ + --ota-provider-app ./out/darwin-${DARWIN_ARCH}-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \ + --ota-requestor-app ./out/darwin-${DARWIN_ARCH}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \ + --tv-app ./out/darwin-${DARWIN_ARCH}-tv-app-${BUILD_VARIANT}/chip-tv-app \ + --bridge-app ./out/darwin-${DARWIN_ARCH}-bridge-${BUILD_VARIANT}/chip-bridge-app \ + --lit-icd-app ./out/darwin-${DARWIN_ARCH}-lit-icd-${BUILD_VARIANT}/lit-icd-app \ + --microwave-oven-app ./out/darwin-${DARWIN_ARCH}-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \ + --rvc-app ./out/darwin-${DARWIN_ARCH}-rvc-${BUILD_VARIANT}/chip-rvc-app \ + --network-manager-app ./out/darwin-${DARWIN_ARCH}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \ " - name: Run purposeful failure tests using the python parser sending commands to chip-tool @@ -409,13 +410,13 @@ jobs: "./scripts/tests/run_test_suite.py \ --runner chip_tool_python \ --include-tags PURPOSEFUL_FAILURE \ - --chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \ + --chip-tool ./out/darwin-${DARWIN_ARCH}-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \ run \ --iterations 1 \ --expected-failures 3 \ --keep-going \ --test-timeout-seconds 120 \ - --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ + --all-clusters-app ./out/darwin-${DARWIN_ARCH}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ " - name: Uploading core files @@ -559,7 +560,7 @@ jobs: TSAN_OPTIONS: "halt_on_error=1" if: github.actor != 'restyled-io[bot]' && false - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout diff --git a/src/app/tests/suites/TestSystemCommands.yaml b/src/app/tests/suites/TestSystemCommands.yaml index 0a7001fdb62158..0e8a2f839f801b 100644 --- a/src/app/tests/suites/TestSystemCommands.yaml +++ b/src/app/tests/suites/TestSystemCommands.yaml @@ -18,6 +18,7 @@ config: nodeId: 0x12344321 cluster: "SystemCommands" endpoint: 0 + timeout: 180 payload: type: char_string defaultValue: "MT:-24J0IX4122-.548G00" # This value needs to be generated diff --git a/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m b/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m index 78a26dba56e880..0103352966c910 100644 --- a/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m +++ b/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m @@ -827,7 +827,7 @@ - (void)test004_Subscribe }]; // Wait for report - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; + [self waitForExpectationsWithTimeout:kTimeoutInSeconds*5 handler:nil]; XCTestExpectation * clearExpectation = [self expectationWithDescription:@"report handlers deregistered"]; [device deregisterReportHandlersWithQueue:queue