Skip to content

Commit

Permalink
Fix bootstrap caching for Darwin framework jobs. (#32758)
Browse files Browse the repository at this point in the history
In #32583 the step to put
zap-cli back got lost, so when bootstrap caching caches our state it's caching
the "there is no zap-cli" state.  Then restoring from cache causes
`dirname $(which zap-cli)` to fail, because there is no zap-cli in the PATH.
  • Loading branch information
bzbarsky-apple authored Mar 27, 2024
1 parent 60b6beb commit ef01670
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ jobs:
- 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 ef01670

Please sign in to comment.