Skip to content

Commit b66d5e9

Browse files
authored
CI cache prunning followup (#5859)
#5858 broke some [things](https://github.com/vortex-data/vortex/actions/runs/20720623251) which this PR should fix. Signed-off-by: Adam Gutglick <[email protected]>
1 parent b12219f commit b66d5e9

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
git status --porcelain
239239
test -z "$(git status --porcelain)"
240240
- name: Prune cache
241-
if: github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true'
241+
if: ${{ github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true' }}
242242
run: cargo sweep --file
243243

244244
check-min-deps:
@@ -295,7 +295,7 @@ jobs:
295295
- name: Rust Lint - Clippy Default Features
296296
run: cargo clippy --locked --all-targets -- -D warnings
297297
- name: Prune cache
298-
if: github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true'
298+
if: ${{ github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true' }}
299299
run: cargo sweep --file
300300

301301
rust-lint-no-default:
@@ -326,7 +326,7 @@ jobs:
326326
# https://spiraldb.slack.com/archives/C07BV3GKAJ2/p1732736281946729
327327
cargo hack clippy --no-default-features -- -D warnings
328328
- name: Prune cache
329-
if: github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true'
329+
if: ${{ github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true' }}
330330
run: cargo sweep --file
331331

332332
rust-semver:
@@ -399,6 +399,7 @@ jobs:
399399
uses: ./.github/actions/setup-rust
400400
with:
401401
repo-token: ${{ secrets.GITHUB_TOKEN }}
402+
timestamp: "true"
402403
- name: Install grcov
403404
uses: taiki-e/install-action@grcov
404405
- name: Install nextest
@@ -444,7 +445,7 @@ jobs:
444445
flags: ${{ matrix.suite }}
445446
use_oidc: true
446447
- name: Prune cache
447-
if: github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true'
448+
if: ${{ github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true' }}
448449
run: cargo sweep --file
449450

450451
rust-test:
@@ -459,7 +460,6 @@ jobs:
459460
- tag=rust-test-sanitizer
460461
env:
461462
# Add debug symbols and enable ASAN/LSAN with better output
462-
RUSTFLAGS: "-A warnings -Zsanitizer=address -Zsanitizer=leak --cfg disable_loom --cfg vortex_nightly -C debuginfo=2 -C opt-level=0 -C strip=none"
463463
ASAN_OPTIONS: "symbolize=1:print_stats=1:check_initialization_order=1:detect_leaks=1:halt_on_error=0:verbosity=1:leak_check_at_exit=1"
464464
LSAN_OPTIONS: "verbosity=1:report_objects=1"
465465
ASAN_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer"
@@ -495,6 +495,8 @@ jobs:
495495
with:
496496
tool: nextest
497497
- name: Rust Tests
498+
env:
499+
RUSTFLAGS: "-A warnings -Zsanitizer=address -Zsanitizer=leak --cfg disable_loom --cfg vortex_nightly -C debuginfo=2 -C opt-level=0 -C strip=none"
498500
run: |
499501
# Build with full debug info first (helps with caching)
500502
cargo +nightly build --locked --workspace --all-features --target x86_64-unknown-linux-gnu
@@ -507,7 +509,7 @@ jobs:
507509
--target x86_64-unknown-linux-gnu \
508510
--verbose
509511
- name: Prune cache
510-
if: github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true'
512+
if: ${{ github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true' }}
511513
run: cargo sweep --file
512514

513515
rust-test-other:
@@ -561,7 +563,7 @@ jobs:
561563
if: matrix.os != 'windows-x64'
562564
run: cargo nextest run --locked --workspace --all-features --no-fail-fast --exclude vortex-bench --exclude vortex-duckdb
563565
- name: Prune cache
564-
if: github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true'
566+
if: ${{ github.ref_name == 'develop' && steps.setup-rust.outputs.deps-cache-hit != 'true' }}
565567
run: cargo sweep --file
566568

567569
build-java:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,6 @@ compile_commands.json
221221
# Claude
222222
.claude
223223

224+
# cargo sweep output
225+
sweep.timestamp
226+

0 commit comments

Comments
 (0)