Skip to content

Commit 793913b

Browse files
prql-botclaude
andauthored
fix: disable cache-bin in rust-cache to fix macos-15 cargo (#5897)
Co-authored-by: Claude <noreply@anthropic.com>
1 parent 815cbd1 commit 793913b

12 files changed

Lines changed: 56 additions & 0 deletions

File tree

.github/actions/build-prqlc-c/action.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ runs:
4646
${{ (github.ref == 'refs/heads/main') && contains(inputs.target,
4747
'musl') }}
4848
shared-key: rust-${{ inputs.target }}
49+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
50+
# on the new macos-15 runner image — see
51+
# https://github.com/Swatinem/rust-cache/issues/341.
52+
cache-bin: "false"
4953

5054
- if: runner.os == 'Linux'
5155
shell: bash

.github/actions/build-prqlc/action.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ runs:
4545
${{ (github.ref == 'refs/heads/main') && contains(inputs.target,
4646
'musl') }}
4747
shared-key: rust-${{ inputs.target }}
48+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
49+
# on the new macos-15 runner image — see
50+
# https://github.com/Swatinem/rust-cache/issues/341.
51+
cache-bin: "false"
4852

4953
- if: runner.os == 'Linux'
5054
shell: bash

.github/actions/tend-setup/action.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ runs:
3434
prefix-key: ${{ hashFiles('./Cargo.lock') }}
3535
shared-key: rust-x86_64-unknown-linux-gnu
3636
save-if: false
37+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
38+
# on the new macos-15 runner image — see
39+
# https://github.com/Swatinem/rust-cache/issues/341.
40+
cache-bin: "false"
3741

3842
- run: |
3943
echo CARGO_TERM_COLOR=always >> $GITHUB_ENV

.github/actions/time-compilation/action.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ runs:
1717
with:
1818
prefix-key: ${{ env.version }}-${{ hashFiles('./Cargo.lock') }}
1919
save-if: ${{ github.ref == 'refs/heads/main' }}
20+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
21+
# on the new macos-15 runner image — see
22+
# https://github.com/Swatinem/rust-cache/issues/341.
23+
cache-bin: "false"
2024
# 'true' seems to require quotes (and using a bare `inputs.use_cache`
2125
# doesn't work); I'm really not sure why. There are some issues on the
2226
# interwebs around this, but I couldn't find one that explained it.

.github/workflows/build-web.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ jobs:
4949
save-if:
5050
${{ github.ref == 'refs/heads/web' || github.ref ==
5151
'refs/heads/main' }}
52+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
53+
# on the new macos-15 runner image — see
54+
# https://github.com/Swatinem/rust-cache/issues/341.
55+
cache-bin: "false"
5256

5357
- uses: go-task/setup-task@v2
5458
with:

.github/workflows/release.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,10 @@ jobs:
351351
# Share key with the `build-web` job
352352
shared-key: web
353353
save-if: false
354+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
355+
# on the new macos-15 runner image — see
356+
# https://github.com/Swatinem/rust-cache/issues/341.
357+
cache-bin: "false"
354358

355359
# This is only required in order to have `cross-env` installed, since `npx
356360
# cross-env` doesn't seem to work in CI (https://github.com/PRQL/prql/pull/3728)

.github/workflows/test-java.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ jobs:
4343
prefix-key: ${{ env.version }}-${{ env.cargo_lock_hash }}
4444
save-if: ${{ github.ref == 'refs/heads/main' }}
4545
shared-key: lib
46+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
47+
# on the new macos-15 runner image — see
48+
# https://github.com/Swatinem/rust-cache/issues/341.
49+
cache-bin: "false"
4650
- name: Maven test
4751
working-directory: prqlc/bindings/java/java/
4852
run: ./mvnw test

.github/workflows/test-js.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ jobs:
6262
# we're out of cache space.
6363
shared-key: web
6464
save-if: false
65+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
66+
# on the new macos-15 runner image — see
67+
# https://github.com/Swatinem/rust-cache/issues/341.
68+
cache-bin: "false"
6569

6670
- run: npm cit
6771
working-directory: prqlc/bindings/js

.github/workflows/test-php.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,9 @@ jobs:
3131
prefix-key: ${{ env.version }}-${{ hashFiles('./Cargo.lock') }}
3232
save-if: ${{ github.ref == 'refs/heads/main' }}
3333
shared-key: lib
34+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
35+
# on the new macos-15 runner image — see
36+
# https://github.com/Swatinem/rust-cache/issues/341.
37+
cache-bin: "false"
3438
- run: task build-php
3539
- run: task test-php

.github/workflows/test-prqlc-c.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ jobs:
2424
prefix-key: ${{ env.version }}-${{ hashFiles('./Cargo.lock') }}
2525
save-if: ${{ github.ref == 'refs/heads/main' }}
2626
shared-key: lib
27+
# Caching `~/.cargo/bin/` breaks the rustup `cargo`/`rustc` symlinks
28+
# on the new macos-15 runner image — see
29+
# https://github.com/Swatinem/rust-cache/issues/341.
30+
cache-bin: "false"
2731
- name: Build
2832
uses: clechasseur/rs-cargo@v4
2933
with:

0 commit comments

Comments
 (0)