Skip to content

Commit e791a35

Browse files
authored
ci(fix): Correct caching logic for capnproto (#11127)
### Description I'd mucked the caching logic around caching of capnproto. Fixing it here. ### Testing Instructions CI
1 parent cdeac3b commit e791a35

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/actions/setup-capnproto/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
path: |
1313
/usr/bin/capnp
1414
/usr/bin/capnpc
15-
key: ${{ runner.os }}-capnproto-0.11
15+
key: ${{ runner.os }}-capnproto-0.11.2
1616

1717
- name: "Cache capnproto (macOS)"
1818
if: runner.os == 'macOS' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
@@ -24,7 +24,7 @@ runs:
2424
/usr/local/bin/capnpc
2525
/opt/homebrew/bin/capnp
2626
/opt/homebrew/bin/capnpc
27-
key: ${{ runner.os }}-capnproto-0.11
27+
key: ${{ runner.os }}-capnproto-0.11.2
2828

2929
- name: "Cache capnproto (Windows)"
3030
if: runner.os == 'Windows' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
@@ -34,19 +34,19 @@ runs:
3434
path: |
3535
C:\ProgramData\chocolatey\bin\capnp.exe
3636
C:\ProgramData\chocolatey\bin\capnpc.exe
37-
key: ${{ runner.os }}-capnproto-0.11
37+
key: ${{ runner.os }}-capnproto-0.11.2
3838

3939
- name: "Setup capnproto for Linux"
40-
if: runner.os == 'Linux' && steps.cache-capnp-linux.outputs.cache-hit != 'true'
40+
if: runner.os == 'Linux' && (steps.cache-capnp-linux.outcome == 'skipped' || steps.cache-capnp-linux.outputs.cache-hit != 'true')
4141
shell: bash
4242
run: sudo apt-get -y update && sudo apt-get install -y capnproto
4343

4444
- name: "Setup capnproto for macos"
45-
if: runner.os == 'macOS' && steps.cache-capnp-macos.outputs.cache-hit != 'true'
45+
if: runner.os == 'macOS' && (steps.cache-capnp-macos.outcome == 'skipped' || steps.cache-capnp-macos.outputs.cache-hit != 'true')
4646
shell: bash
4747
run: brew install capnp
4848

4949
- name: "Setup capnproto for Windows"
50-
if: runner.os == 'Windows' && steps.cache-capnp-windows.outputs.cache-hit != 'true'
50+
if: runner.os == 'Windows' && (steps.cache-capnp-windows.outcome == 'skipped' || steps.cache-capnp-windows.outputs.cache-hit != 'true')
5151
shell: bash
5252
run: choco install capnproto

0 commit comments

Comments
 (0)