Skip to content

Commit 713c1f0

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into python-version-attribute
DCO Remediation Commit for d33bs <[email protected]> I, d33bs <[email protected]>, hereby add my Signed-off-by to this commit: 7030b9c Signed-off-by: d33bs <[email protected]>
2 parents 7030b9c + 1174399 commit 713c1f0

File tree

55 files changed

+1823
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1823
-376
lines changed

.github/release-drafter.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name-template: "🌪 $RESOLVED_VERSION"
1+
name-template: "$RESOLVED_VERSION"
22
tag-template: "$RESOLVED_VERSION"
33
categories:
44
- title: "⚠️ Breaks"
@@ -36,6 +36,9 @@ version-resolver:
3636
- "wire-break"
3737
default: patch
3838

39+
exclude-labels:
40+
- "skip-changelog"
41+
3942
template: |
4043
## Changes
4144

.github/workflows/bench-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
types: [labeled, synchronize]
88
branches: ["develop"]
9-
workflow_dispatch: {}
9+
workflow_dispatch: { }
1010

1111
permissions:
1212
actions: write # for removing labels

.github/workflows/ci.yml

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
55
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
66

7-
on:
8-
push:
9-
branches: ["develop"]
10-
pull_request: {}
11-
workflow_dispatch: {}
7+
on: [push, pull_request, workflow_dispatch]
128

139
permissions:
1410
actions: read
@@ -38,8 +34,7 @@ jobs:
3834
# Lint the workflows and yamllint's configuration file.
3935
yamllint \
4036
--strict \
41-
-c yamllint-config.yaml \
42-
yamllint-config.yaml \
37+
-c .yamllint.yaml \
4338
.github/
4439
4540
python-lint:
@@ -311,6 +306,43 @@ jobs:
311306
# https://spiraldb.slack.com/archives/C07BV3GKAJ2/p1732736281946729
312307
cargo hack clippy --no-default-features -- -D warnings
313308
309+
rust-semver:
310+
name: "Rust (semver checks)"
311+
timeout-minutes: 120
312+
if: github.ref != 'refs/heads/develop'
313+
runs-on:
314+
- runs-on=${{ github.run_id }}
315+
- family=m7i+m7i-flex+m7a
316+
- cpu=16
317+
- image=ubuntu24-full-x64
318+
- extras=s3-cache
319+
- tag=rust-semver
320+
steps:
321+
- uses: runs-on/action@v2
322+
with:
323+
sccache: s3
324+
- uses: actions/checkout@v6
325+
with:
326+
fetch-depth: 0
327+
fetch-tags: true
328+
- uses: ./.github/actions/setup-rust
329+
with:
330+
repo-token: ${{ secrets.GITHUB_TOKEN }}
331+
332+
# We have to set the correct Cargo.toml versions so semver checks uses the previous release.
333+
- name: Latest Tag
334+
id: latest-tag
335+
run: |
336+
LATEST_TAG=$(git describe --tags --abbrev=0)
337+
echo "tag=$LATEST_TAG" >> $GITHUB_OUTPUT
338+
- name: Cargo Set Version
339+
run: |
340+
cargo install cargo-edit
341+
cargo set-version --workspace ${{ steps.latest-tag.outputs.tag }}
342+
343+
- name: Check semver
344+
uses: obi1kenobi/cargo-semver-checks-action@v2
345+
314346
rust-coverage:
315347
name: "Rust tests (coverage)"
316348
timeout-minutes: 120
@@ -351,6 +383,8 @@ jobs:
351383
tool: nextest
352384
- name: Rust Tests
353385
if: ${{ matrix.suite == 'tests' }}
386+
env:
387+
RUSTFLAGS: "-Cinstrument-coverage -A warnings --cfg vortex_nightly"
354388
run: |
355389
cargo +nightly nextest run --locked --workspace --all-features --no-fail-fast
356390
- name: Run TPC-H
@@ -397,7 +431,7 @@ jobs:
397431
- tag=rust-test-sanitizer
398432
env:
399433
# Add debug symbols and enable ASAN/LSAN with better output
400-
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"
401435
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"
402436
LSAN_OPTIONS: "verbosity=1:report_objects=1"
403437
ASAN_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer"
@@ -637,7 +671,7 @@ jobs:
637671
timeout-minutes: 120
638672
env:
639673
MIRIFLAGS: -Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-env-forward=RUST_BACKTRACE
640-
RUSTFLAGS: "-A warnings"
674+
RUSTFLAGS: "-A warnings --cfg vortex_nightly"
641675
RUST_BACKTRACE: full
642676
steps:
643677
- uses: actions/checkout@v6

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Vortex Docs
33
on:
44
push:
55
branches: [develop]
6-
workflow_dispatch: {}
6+
workflow_dispatch: { }
77

88
permissions:
99
contents: read

.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

.github/workflows/labels.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
"performance"
3535
"break"
3636
"wire-break"
37+
"skip-changelog"
3738
)
3839
REQUIRED_LABELS_JSON=$(jq -n '$ARGS.positional' --args "${REQUIRED_LABELS[@]}")
3940
echo "Required Labels: $REQUIRED_LABELS_JSON"

.github/workflows/release-drafter.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ on:
33
push:
44
branches:
55
- develop
6+
workflow_dispatch:
7+
# Permits a custom run to create a pre-release
8+
inputs:
9+
prerelease-identifier:
10+
description: "RC identifier (e.g., rc, beta, alpha)"
11+
type: string
12+
default: "rc"
613

714
permissions:
815
contents: read
@@ -14,9 +21,10 @@ jobs:
1421
contents: write
1522
runs-on: ubuntu-latest
1623
steps:
17-
# Drafts your next Release notes as Pull Requests are merged into "develop"
1824
- uses: release-drafter/[email protected]
1925
env:
2026
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2127
with:
22-
commitish: "develop"
28+
commitish: ${{ github.ref_name }}
29+
prerelease: ${{ github.event_name == 'workflow_dispatch' }}
30+
prerelease-identifier: ${{ inputs.prerelease-identifier || '' }}

.github/workflows/sql-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
types: [labeled, synchronize]
88
branches: ["develop"]
9-
workflow_dispatch: {}
9+
workflow_dispatch: { }
1010

1111
permissions:
1212
actions: write # for removing labels
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ rules:
1414
forbid: false
1515
min-spaces-inside: 1
1616
max-spaces-inside: 1
17-
min-spaces-inside-empty: 0
18-
max-spaces-inside-empty: 0
17+
min-spaces-inside-empty: 1
18+
max-spaces-inside-empty: 1
1919
brackets:
2020
forbid: false
2121
min-spaces-inside: 0

0 commit comments

Comments
 (0)