Skip to content

Commit

Permalink
Remove zap-cli restore workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
ksperling-apple committed Mar 27, 2024
1 parent 77b367a commit 726e8be
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,12 @@ jobs:
- name: Block zap-cli from being used
run: |
# Framework builds are NOT expected to require zap-cli
scripts/run_in_build_env.sh 'D=$(dirname $(which zap-cli)) && mv $D/zap-cli $D/zap-cli.moved'
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
- name: Build
working-directory: src/darwin/Framework
run: xcodebuild -target "Matter" ${{ matrix.options.arguments }}
# Now restore zap-cli, so that bootstrap caching does not cache the state when it's been renamed.
- name: Make zap-cli work again
run: scripts/run_in_build_env.sh 'D=$(dirname $(which zap-cli.moved)) && mv $D/zap-cli.moved $D/zap-cli'

tests:
name: Run framework tests
Expand Down

0 comments on commit 726e8be

Please sign in to comment.