Skip to content

Commit 8a9eda3

Browse files
committed
feat: output brew prefix and use it in cache paths
chore: remove brew download cache unconditionally
1 parent 06d52bb commit 8a9eda3

File tree

1 file changed

+31
-6
lines changed

1 file changed

+31
-6
lines changed

.github/actions/pristine-homebrew/action.yml

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,23 @@ runs:
3434
echo "$prefix/Library/Taps"
3535
echo "EOF"
3636
} >> $GITHUB_ENV
37+
echo prefix=$(brew --prefix) >> "$GITHUB_OUTPUT"
3738
echo version=$(brew --version | sed -e '1s/[<>:"\/\\|?* \t]/_/g' -e '2,$d') >> "$GITHUB_OUTPUT"
3839
- name: Cache lookup
3940
id: cache_lookup
4041
uses: actions/cache/restore@v4
4142
with:
4243
lookup-only: true
43-
path: |-
44-
${{ env.CACHE_PATHS }}
44+
path: |
45+
${{ steps.brew.outputs.prefix }}/bin
46+
${{ steps.brew.outputs.prefix }}/etc
47+
${{ steps.brew.outputs.prefix }}/etc
48+
${{ steps.brew.outputs.prefix }}/lib
49+
${{ steps.brew.outputs.prefix }}/opt
50+
${{ steps.brew.outputs.prefix }}/sbin
51+
${{ steps.brew.outputs.prefix }}/share
52+
${{ steps.brew.outputs.prefix }}/var
53+
${{ steps.brew.outputs.prefix }}/Library/Taps
4554
key: brew-pristine-${{ inputs.os }}-${{ steps.brew.outputs.version }}
4655
- name: Remove current Homebrew directories
4756
if: inputs.restore == 'true' && steps.cache_lookup.outputs.cache-hit == 'true'
@@ -55,8 +64,16 @@ runs:
5564
if: inputs.restore == 'true' && steps.cache_lookup.outputs.cache-hit == 'true'
5665
uses: actions/cache/restore@v4
5766
with:
58-
path: |-
59-
${{ env.CACHE_PATHS }}
67+
path: |
68+
${{ steps.brew.outputs.prefix }}/bin
69+
${{ steps.brew.outputs.prefix }}/etc
70+
${{ steps.brew.outputs.prefix }}/etc
71+
${{ steps.brew.outputs.prefix }}/lib
72+
${{ steps.brew.outputs.prefix }}/opt
73+
${{ steps.brew.outputs.prefix }}/sbin
74+
${{ steps.brew.outputs.prefix }}/share
75+
${{ steps.brew.outputs.prefix }}/var
76+
${{ steps.brew.outputs.prefix }}/Library/Taps
6077
key: ${{ steps.cache_lookup.outputs.cache-primary-key }}
6178
- name: Make Homebrew pristine
6279
if: steps.cache_lookup.outputs.cache-hit != 'true'
@@ -91,8 +108,16 @@ runs:
91108
if: steps.cache_lookup.outputs.cache-hit != 'true'
92109
uses: actions/cache/save@v4
93110
with:
94-
path: |-
95-
${{ env.CACHE_PATHS }}
111+
path: |
112+
${{ steps.brew.outputs.prefix }}/bin
113+
${{ steps.brew.outputs.prefix }}/etc
114+
${{ steps.brew.outputs.prefix }}/etc
115+
${{ steps.brew.outputs.prefix }}/lib
116+
${{ steps.brew.outputs.prefix }}/opt
117+
${{ steps.brew.outputs.prefix }}/sbin
118+
${{ steps.brew.outputs.prefix }}/share
119+
${{ steps.brew.outputs.prefix }}/var
120+
${{ steps.brew.outputs.prefix }}/Library/Taps
96121
key: ${{ steps.cache_lookup.outputs.cache-primary-key }}
97122
- name: Remove brew download cache
98123
if: inputs.restore == 'true'

0 commit comments

Comments
 (0)