Skip to content

Commit 5671ef2

Browse files
committed
Do not reuse pregenerated output on macOS
This would need zstd and other tools which are not available by default. Also the main reason we did this was for our aarch64 runner, which is resource constraint. This should not be a problem on the M1.
1 parent 6385e68 commit 5671ef2

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

.github/workflows/build.yaml

+22-15
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
path: ./project-chip
5252
- name: Checkout submodules
5353
working-directory: ./project-chip
54-
run: scripts/checkout_submodules.py --shallow --platform linux --platform darwin
54+
run: scripts/checkout_submodules.py --shallow --platform linux
5555
- name: Apply patches
5656
working-directory: ./project-chip
5757
run: |
@@ -62,7 +62,7 @@ jobs:
6262
done
6363
- name: Bootstrap
6464
working-directory: ./project-chip
65-
run: bash scripts/bootstrap.sh
65+
run: bash scripts/bootstrap.sh -p all,linux
6666
- name: ZAP Code pre-generation
6767
working-directory: ./project-chip
6868
run: scripts/run_in_build_env.sh "scripts/codepregen.py ./zzz_pregenerated/"
@@ -120,7 +120,7 @@ jobs:
120120
git config --global --add safe.directory "*"
121121
rm -rf out/
122122
- name: Bootstrap
123-
run: bash scripts/bootstrap.sh
123+
run: bash scripts/bootstrap.sh -p all,linux
124124
- name: Setup Build, Run Build and Run Tests
125125
run: |
126126
scripts/build/gn_gen.sh --args=" \
@@ -194,22 +194,29 @@ jobs:
194194
working-directory: ./project-chip
195195

196196
steps:
197-
- name: Restore Matter SDK from artifacts
198-
uses: actions/download-artifact@v3
197+
- name: Checkout CHIP SDK repository
198+
uses: actions/checkout@v3
199199
with:
200-
name: matter-sdk-${{ github.run_id }}
201-
- name: Extract Matter SDK from tar
202-
working-directory: ./
200+
repository: project-chip/connectedhomeip
201+
ref: ${{ env.matter_sdk_ref }}
202+
path: ./project-chip
203+
- name: Checkout submodules
204+
working-directory: ./project-chip
205+
run: scripts/checkout_submodules.py --shallow --platform darwin
206+
- name: Apply patches
207+
working-directory: ./project-chip
203208
run: |
204-
rm -rf project-chip
205-
mkdir -p project-chip
206-
cd project-chip
207-
apt update && apt install zstd
208-
tar -xaf ../project-chip.tar.zst --use-compress-program=zstdmt .
209-
git config --global --add safe.directory "*"
210-
rm -rf out/
209+
for patch in ../*.patch
210+
do
211+
echo "Applying ${patch}"
212+
patch -p1 < $patch
213+
done
211214
- name: Bootstrap
215+
working-directory: ./project-chip
212216
run: bash scripts/bootstrap.sh -p all,darwin
217+
- name: ZAP Code pre-generation
218+
working-directory: ./project-chip
219+
run: scripts/run_in_build_env.sh "scripts/codepregen.py ./zzz_pregenerated/"
213220
- name: Setup Build, Run Build and Run Tests
214221
run: |
215222
scripts/build/gn_gen.sh --args=" \

0 commit comments

Comments
 (0)