mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ci: fix broken homebrew cache (#27224)

Browse source 
remove brew cache completely

Revert "remove brew cache completely"

This reverts commit ec4636cc249c2ef762cf7c00955acfa473745aa1.

Revert "ci: fix broken homebrew cache"

This reverts commit ed0415532ba6c69160a4ed48f111487fc22d2240.

this should work
This commit is contained in:
John Kleinschmidt 2021-01-07 15:09:46 -05:00 committed by GitHub
parent 85a9abf377
commit c29923ae8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.circleci/config.yml
View file

@ -316,15 +316,17 @@ step-setup-goma-for-build: &step-setup-goma-for-build
step-restore-brew-cache: &step-restore-brew-cache step-restore-brew-cache: &step-restore-brew-cache
restore_cache: restore_cache:
paths: paths:
- /usr/local/Homebrew - /usr/local/Cellar/gnu-tar
- /usr/local/bin/gtar
keys: keys:
- v2-brew-cache-{{ arch }} - v4-brew-cache-{{ arch }}
step-save-brew-cache: &step-save-brew-cache step-save-brew-cache: &step-save-brew-cache
save_cache: save_cache:
paths: paths:
- /usr/local/Homebrew - /usr/local/Cellar/gnu-tar
key: v2-brew-cache-{{ arch }} - /usr/local/bin/gtar
key: v4-brew-cache-{{ arch }}
name: Persisting brew cache name: Persisting brew cache
step-get-more-space-on-mac: &step-get-more-space-on-mac step-get-more-space-on-mac: &step-get-more-space-on-mac
@ -461,8 +463,10 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
name: Install gnu-tar on macos name: Install gnu-tar on macos
command: | command: |
if [ "`uname`" == "Darwin" ]; then if [ "`uname`" == "Darwin" ]; then
brew update if [ ! -d /usr/local/Cellar/gnu-tar/ ]; then
brew install gnu-tar brew update
brew install gnu-tar
fi
ln -fs /usr/local/bin/gtar /usr/local/bin/tar ln -fs /usr/local/bin/gtar /usr/local/bin/tar
fi fi
@ -1194,7 +1198,6 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
- *step-depot-tools-add-to-path - *step-depot-tools-add-to-path
- *step-setup-env-for-build - *step-setup-env-for-build
- *step-setup-goma-for-build - *step-setup-goma-for-build
- *step-restore-brew-cache
- *step-get-more-space-on-mac - *step-get-more-space-on-mac
- *step-install-npm-deps-on-mac - *step-install-npm-deps-on-mac
- *step-fix-sync-on-mac - *step-fix-sync-on-mac