Skip to content

Commit

Permalink
Do not reuse pregenerated output on macOS
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
agners committed Feb 6, 2024
1 parent 6385e68 commit 5671ef2
Showing 1 changed file with 22 additions and 15 deletions.
37 changes: 22 additions & 15 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
path: ./project-chip
- name: Checkout submodules
working-directory: ./project-chip
run: scripts/checkout_submodules.py --shallow --platform linux --platform darwin
run: scripts/checkout_submodules.py --shallow --platform linux
- name: Apply patches
working-directory: ./project-chip
run: |
Expand All @@ -62,7 +62,7 @@ jobs:
done
- name: Bootstrap
working-directory: ./project-chip
run: bash scripts/bootstrap.sh
run: bash scripts/bootstrap.sh -p all,linux
- name: ZAP Code pre-generation
working-directory: ./project-chip
run: scripts/run_in_build_env.sh "scripts/codepregen.py ./zzz_pregenerated/"
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
git config --global --add safe.directory "*"
rm -rf out/
- name: Bootstrap
run: bash scripts/bootstrap.sh
run: bash scripts/bootstrap.sh -p all,linux
- name: Setup Build, Run Build and Run Tests
run: |
scripts/build/gn_gen.sh --args=" \
Expand Down Expand Up @@ -194,22 +194,29 @@ jobs:
working-directory: ./project-chip

steps:
- name: Restore Matter SDK from artifacts
uses: actions/download-artifact@v3
- name: Checkout CHIP SDK repository
uses: actions/checkout@v3
with:
name: matter-sdk-${{ github.run_id }}
- name: Extract Matter SDK from tar
working-directory: ./
repository: project-chip/connectedhomeip
ref: ${{ env.matter_sdk_ref }}
path: ./project-chip
- name: Checkout submodules
working-directory: ./project-chip
run: scripts/checkout_submodules.py --shallow --platform darwin
- name: Apply patches
working-directory: ./project-chip
run: |
rm -rf project-chip
mkdir -p project-chip
cd project-chip
apt update && apt install zstd
tar -xaf ../project-chip.tar.zst --use-compress-program=zstdmt .
git config --global --add safe.directory "*"
rm -rf out/
for patch in ../*.patch
do
echo "Applying ${patch}"
patch -p1 < $patch
done
- name: Bootstrap
working-directory: ./project-chip
run: bash scripts/bootstrap.sh -p all,darwin
- name: ZAP Code pre-generation
working-directory: ./project-chip
run: scripts/run_in_build_env.sh "scripts/codepregen.py ./zzz_pregenerated/"
- name: Setup Build, Run Build and Run Tests
run: |
scripts/build/gn_gen.sh --args=" \
Expand Down

0 comments on commit 5671ef2

Please sign in to comment.