Skip to content

Commit 37520fd

Browse files
authored
Fix: add RUSTFLAGS="--cfg vortex_nightly" to all nightly tests (#5655)
I think this is everything, I had claude search through all of our actions --------- Signed-off-by: Connor Tsui <[email protected]>
1 parent c0d44ef commit 37520fd

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ jobs:
383383
tool: nextest
384384
- name: Rust Tests
385385
if: ${{ matrix.suite == 'tests' }}
386+
env:
387+
RUSTFLAGS: "-Cinstrument-coverage -A warnings --cfg vortex_nightly"
386388
run: |
387389
cargo +nightly nextest run --locked --workspace --all-features --no-fail-fast
388390
- name: Run TPC-H
@@ -429,7 +431,7 @@ jobs:
429431
- tag=rust-test-sanitizer
430432
env:
431433
# Add debug symbols and enable ASAN/LSAN with better output
432-
RUSTFLAGS: "-A warnings -Zsanitizer=address -Zsanitizer=leak --cfg disable_loom -C debuginfo=2 -C opt-level=0 -C strip=none"
434+
RUSTFLAGS: "-A warnings -Zsanitizer=address -Zsanitizer=leak --cfg disable_loom --cfg vortex_nightly -C debuginfo=2 -C opt-level=0 -C strip=none"
433435
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"
434436
LSAN_OPTIONS: "verbosity=1:report_objects=1"
435437
ASAN_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer"
@@ -669,7 +671,7 @@ jobs:
669671
timeout-minutes: 120
670672
env:
671673
MIRIFLAGS: -Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-env-forward=RUST_BACKTRACE
672-
RUSTFLAGS: "-A warnings"
674+
RUSTFLAGS: "-A warnings --cfg vortex_nightly"
673675
RUST_BACKTRACE: full
674676
steps:
675677
- uses: actions/checkout@v6

.github/workflows/fuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Run fuzzing target
5050
id: fuzz
5151
run: |
52-
RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions file_io -- -max_total_time=7200 2>&1 | tee fuzz_output.log
52+
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions file_io -- -max_total_time=7200 2>&1 | tee fuzz_output.log
5353
continue-on-error: true
5454
- name: Check for crashes
5555
id: check
@@ -182,7 +182,7 @@ jobs:
182182
- name: Run fuzzing target
183183
id: fuzz
184184
run: |
185-
RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions array_ops -- -max_total_time=7200 2>&1 | tee fuzz_output.log
185+
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions array_ops -- -max_total_time=7200 2>&1 | tee fuzz_output.log
186186
continue-on-error: true
187187
- name: Check for crashes
188188
id: check

.github/workflows/fuzzer-fix-automation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
echo "Building fuzzer target: ${{ steps.extract.outputs.target }} (debug mode for faster build)"
164164
165165
# Build the fuzzer target in debug mode (faster than release)
166-
if cargo +nightly fuzz build --dev --sanitizer=none "${{ steps.extract.outputs.target }}" 2>&1 | tee fuzzer_build.log; then
166+
if RUSTFLAGS="--cfg vortex_nightly" cargo +nightly fuzz build --dev --sanitizer=none "${{ steps.extract.outputs.target }}" 2>&1 | tee fuzzer_build.log; then
167167
echo "✅ Fuzzer target built successfully"
168168
echo "build_success=true" >> $GITHUB_OUTPUT
169169
else
@@ -183,7 +183,7 @@ jobs:
183183
echo "Attempting to reproduce crash with fuzzer (debug mode)..."
184184
185185
# Run fuzzer with crash file (debug mode, no sanitizer, full backtrace)
186-
RUST_BACKTRACE=full timeout 30s cargo +nightly fuzz run --dev --sanitizer=none "${{ steps.extract.outputs.target }}" "${{ steps.download.outputs.crash_file_path }}" -- -runs=1 2>&1 | tee crash_reproduction.log
186+
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=full timeout 30s cargo +nightly fuzz run --dev --sanitizer=none "${{ steps.extract.outputs.target }}" "${{ steps.download.outputs.crash_file_path }}" -- -runs=1 2>&1 | tee crash_reproduction.log
187187
188188
FUZZ_EXIT_CODE=${PIPESTATUS[0]}
189189

bench-vortex/src/realnest/gharchive.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,7 @@ impl GithubArchive {
126126

127127
impl Benchmark for GithubArchive {
128128
fn queries(&self) -> anyhow::Result<Vec<(usize, String)>> {
129-
Ok(QUERIES
130-
.iter()
131-
.map(|s| (s.to_string()))
132-
.enumerate()
133-
.collect())
129+
Ok(QUERIES.iter().map(|s| s.to_string()).enumerate().collect())
134130
}
135131

136132
fn generate_data(&self, target: &Target) -> anyhow::Result<()> {

0 commit comments

Comments
 (0)