From 726e8be489bd5130368c4a45b0b2ac98dc1f7bda Mon Sep 17 00:00:00 2001 From: Karsten Sperling Date: Thu, 28 Mar 2024 10:37:16 +1300 Subject: [PATCH] Remove zap-cli restore workaround --- .github/workflows/darwin.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index ed468af153f43c..f84c85e5716189 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -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