Skip to content

Commit f08756a

Browse files
Stop using the pigweed clang for darwin-framework-tool. (project-chip#29927)
It does not play nicely with CLANG_ENABLE_MODULES, and we will need that for using Swift in Matter.framework.
1 parent c1d6700 commit f08756a

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

.github/workflows/darwin-tests.yaml

+14-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828

2929
env:
3030
CHIP_NO_LOG_TIMESTAMPS: true
31-
31+
3232
jobs:
3333
test_suites_chip_tool_darwin:
3434
name: Test Suites - Darwin
@@ -38,6 +38,14 @@ jobs:
3838
build_variant: [no-ble-asan-clang]
3939
env:
4040
BUILD_VARIANT: ${{matrix.build_variant}}
41+
42+
# We can't use the pigweed clang to build the Darwin framework once we start using
43+
# Swift, because it does not handle CLANG_ENABLE_MODULES correctly.
44+
#
45+
# But the Xcode clang does not handle LSan correctly. Since we can't easily apply
46+
# LSAN_OPTIONS to just everything except darwin-framework-tool, instead disable asan for
47+
# it.
48+
BUILD_VARIANT_FRAMEWORK_TOOL: no-ble
4149
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
4250

4351
if: github.actor != 'restyled-io[bot]'
@@ -83,7 +91,7 @@ jobs:
8391
run: |
8492
./scripts/run_in_build_env.sh \
8593
"./scripts/build/build_examples.py \
86-
--target darwin-x64-darwin-framework-tool-${BUILD_VARIANT} \
94+
--target darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
8795
--target darwin-x64-all-clusters-${BUILD_VARIANT} \
8896
--target darwin-x64-lock-${BUILD_VARIANT} \
8997
--target darwin-x64-ota-provider-${BUILD_VARIANT} \
@@ -97,7 +105,7 @@ jobs:
97105
run: |
98106
./scripts/run_in_build_env.sh \
99107
"./scripts/tests/run_test_suite.py \
100-
--chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
108+
--chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
101109
--target-skip-glob '{TestAccessControlConstraints}' \
102110
run \
103111
--iterations 1 \
@@ -114,7 +122,7 @@ jobs:
114122
./scripts/run_in_build_env.sh \
115123
"./scripts/tests/run_darwin_framework_ota_test.py \
116124
run \
117-
--darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
125+
--darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
118126
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
119127
--ota-data-file /tmp/rawImage \
120128
--ota-image-file /tmp/otaImage \
@@ -139,8 +147,8 @@ jobs:
139147
uses: actions/upload-artifact@v3
140148
if: ${{ failure() && !env.ACT }}
141149
with:
142-
name: framework-build-log-darwin-${{ matrix.build_variant }}
143-
path: out/darwin-x64-darwin-framework-tool-${{ matrix.build_variant }}/darwin_framework_build.log
150+
name: framework-build-log-darwin-${{BUILD_VARIANT_FRAMEWORK_TOOL}}
151+
path: out/darwin-x64-darwin-framework-tool-${{BUILD_VARIANT_FRAMEWORK_TOOL}}/darwin_framework_build.log
144152
- name: Uploading objdir for debugging
145153
uses: actions/upload-artifact@v3
146154
if: ${{ failure() && !env.ACT }}

0 commit comments

Comments
 (0)