Skip to content

Commit 9d374e4

Browse files
authored
Further cache tweaks (#266)
1 parent 5977c1d commit 9d374e4

5 files changed

Lines changed: 1 addition & 33 deletions

File tree

.github/workflows/R-CMD-check.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- name: Caching
3535
uses: Swatinem/rust-cache@v2
3636
with:
37-
prefix-key: v4-rust
3837
shared-key: ${{ runner.os }}-R-CMD-Check
3938
cache-on-failure: true
4039

.github/workflows/build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
- name: Caching
3939
uses: Swatinem/rust-cache@v2
4040
with:
41-
prefix-key: v4-rust
4241
shared-key: ${{ runner.os }}-build
4342
cache-on-failure: true
4443

.github/workflows/publish.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
- name: Caching
4040
uses: Swatinem/rust-cache@v2
4141
with:
42-
prefix-key: v4-rust
4342
shared-key: ${{ runner.os }}-publish
4443
cache-on-failure: true
4544

.github/workflows/python.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
- name: Rust cache
4646
uses: Swatinem/rust-cache@v2
4747
with:
48-
prefix-key: v4-rust
4948
shared-key: ${{ matrix.os }}-python
5049
cache-on-failure: true
5150

@@ -65,15 +64,7 @@ jobs:
6564
working-directory: ggsql-python
6665
command: build
6766
args: --release
68-
sccache: true
69-
env:
70-
# On Windows/MSVC, the cc crate's cl.exe detection bypasses its
71-
# RUSTC_WRAPPER-based sccache fallback. Setting CC/CXX tells the
72-
# cc crate to parse "sccache" as a known wrapper and "cl" as the
73-
# compiler, routing DuckDB C++ builds through sccache.
74-
# ilammy/msvc-dev-cmd puts cl.exe on PATH so sccache can find it.
75-
CC: ${{ runner.os == 'Windows' && 'sccache cl' || '' }}
76-
CXX: ${{ runner.os == 'Windows' && 'sccache cl' || '' }}
67+
sccache: false
7768

7869
- name: Install wheel and test dependencies
7970
shell: bash

.github/workflows/release-packages.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ jobs:
3131
with:
3232
targets: x86_64-pc-windows-msvc
3333

34-
- name: Rust cache
35-
uses: Swatinem/rust-cache@v2
36-
with:
37-
shared-key: windows-release
38-
3934
- name: Install cargo-packager
4035
run: cargo install cargo-packager --locked
4136

@@ -85,11 +80,6 @@ jobs:
8580
with:
8681
targets: x86_64-apple-darwin, aarch64-apple-darwin
8782

88-
- name: Rust cache
89-
uses: Swatinem/rust-cache@v2
90-
with:
91-
shared-key: macos-release
92-
9383
- name: Install cargo-packager
9484
run: cargo install cargo-packager --locked
9585

@@ -135,11 +125,6 @@ jobs:
135125
with:
136126
targets: x86_64-unknown-linux-gnu
137127

138-
- name: Rust cache
139-
uses: Swatinem/rust-cache@v2
140-
with:
141-
shared-key: linux-release
142-
143128
- name: Install system dependencies
144129
run: |
145130
sudo apt-get update
@@ -189,11 +174,6 @@ jobs:
189174
- name: Install Rust toolchain
190175
uses: dtolnay/rust-toolchain@stable
191176

192-
- name: Rust cache
193-
uses: Swatinem/rust-cache@v2
194-
with:
195-
shared-key: cargo-publish
196-
197177
- name: Get crates.io publish token
198178
uses: rust-lang/crates-io-auth-action@v1
199179
id: auth

0 commit comments

Comments
 (0)