Skip to content

Commit bd8fa90

Browse files
Speed up Darwin CI by enabling unified build on darwin-tests.yaml (project-chip#42191)
* Speed up Darwin CI by enabling unified build on darwin-tests.yaml * fix framework tool path
1 parent 67d831e commit bd8fa90

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

.github/workflows/darwin-tests.yaml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,29 @@ jobs:
9090
- name: Clean Build
9191
run: xcodebuild clean
9292
working-directory: src/darwin/Framework
93-
- name: Build Apps
93+
- name: Build Apps Using Unified Build
94+
run: |
95+
./scripts/run_in_build_env.sh \
96+
"./scripts/build/build_examples.py \
97+
--target darwin-${{matrix.arch}}-lock-${BUILD_VARIANT}-unified \
98+
--target darwin-${{matrix.arch}}-bridge-${BUILD_VARIANT}-unified \
99+
--target darwin-${{matrix.arch}}-microwave-oven-${BUILD_VARIANT}-unified \
100+
--target darwin-${{matrix.arch}}-rvc-${BUILD_VARIANT}-unified \
101+
--target darwin-${{matrix.arch}}-ota-provider-${BUILD_VARIANT}-unified \
102+
build \
103+
--copy-artifacts-to objdir-clone \
104+
"
105+
- name: Clean out
106+
run: rm -rf out/
107+
- name: Build Remaining Apps That Don't Support Unified Build
94108
run: |
95109
./scripts/run_in_build_env.sh \
96110
"./scripts/build/build_examples.py \
97111
--target darwin-${{matrix.arch}}-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
98112
--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} \
101113
--target darwin-${{matrix.arch}}-ota-requestor-${BUILD_VARIANT} \
102114
--target darwin-${{matrix.arch}}-tv-app-${BUILD_VARIANT} \
103-
--target darwin-${{matrix.arch}}-bridge-${BUILD_VARIANT} \
104115
--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} \
107116
--target darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT} \
108117
--target darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT} \
109118
--target darwin-${{matrix.arch}}-energy-management-${BUILD_VARIANT} \
@@ -120,25 +129,25 @@ jobs:
120129
run \
121130
--iterations 1 \
122131
--test-timeout-seconds 120 \
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 \
132+
--all-clusters-app ./objdir-clone/darwin-${{matrix.arch}}-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
133+
--lock-app ./objdir-clone/darwin-${{matrix.arch}}-lock-${BUILD_VARIANT}-unified/chip-lock-app \
134+
--ota-provider-app ./objdir-clone/darwin-${{matrix.arch}}-ota-provider-${BUILD_VARIANT}-unified/chip-ota-provider-app \
135+
--ota-requestor-app ./objdir-clone/darwin-${{matrix.arch}}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
136+
--tv-app ./objdir-clone/darwin-${{matrix.arch}}-tv-app-${BUILD_VARIANT}/chip-tv-app \
137+
--bridge-app ./objdir-clone/darwin-${{matrix.arch}}-bridge-${BUILD_VARIANT}-unified/chip-bridge-app \
138+
--microwave-oven-app ./objdir-clone/darwin-${{matrix.arch}}-microwave-oven-${BUILD_VARIANT}-unified/chip-microwave-oven-app \
139+
--rvc-app ./objdir-clone/darwin-${{matrix.arch}}-rvc-${BUILD_VARIANT}-unified/chip-rvc-app \
140+
--network-manager-app ./objdir-clone/darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
141+
--energy-gateway-app ./objdir-clone/darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
142+
--energy-management-app ./objdir-clone/darwin-${{matrix.arch}}-energy-management-${BUILD_VARIANT}/chip-energy-management-app \
134143
"
135144
- name: Run OTA Test
136145
run: |
137146
./scripts/run_in_build_env.sh \
138147
"./scripts/tests/run_darwin_framework_ota_test.py \
139148
run \
140149
--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 \
150+
--ota-requestor-app ./objdir-clone/darwin-${{matrix.arch}}-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
142151
--ota-data-file /tmp/rawImage \
143152
--ota-image-file /tmp/otaImage \
144153
--ota-destination-file /tmp/downloadedImage \

0 commit comments

Comments
 (0)