Skip to content

Commit 8d2f218

Browse files
committed
fix
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent c7893d4 commit 8d2f218

1 file changed

Lines changed: 6 additions & 63 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
name: "Python (lint)"
5151
runs-on: >-
5252
${{ github.repository == 'vortex-data/vortex'
53-
&& format('runs-on={0}/runner=amd64-medium/tag=python-lint', github.run_id)
53+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=python-lint', github.run_id)
5454
|| 'ubuntu-latest' }}
5555
timeout-minutes: 120
5656
steps:
@@ -59,14 +59,7 @@ jobs:
5959
with:
6060
sccache: s3
6161
- uses: actions/checkout@v6
62-
- uses: ./.github/actions/setup-rust
63-
with:
64-
repo-token: ${{ secrets.GITHUB_TOKEN }}
65-
- name: Install uv
66-
uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
67-
with:
68-
sync: false
69-
prune-cache: false
62+
- uses: ./.github/actions/setup-prebuild
7063
# Use uvx for ruff to avoid building the Rust extension (saves ~4.5 min)
7164
- name: Python Lint - Format
7265
run: uvx ruff format --check .
@@ -82,7 +75,7 @@ jobs:
8275
name: "Python (test)"
8376
runs-on: >-
8477
${{ github.repository == 'vortex-data/vortex'
85-
&& format('runs-on={0}/runner=amd64-large/tag=python-test', github.run_id)
78+
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre-v2/tag=python-test', github.run_id)
8679
|| 'ubuntu-latest' }}
8780
timeout-minutes: 120
8881
env:
@@ -94,16 +87,7 @@ jobs:
9487
with:
9588
sccache: s3
9689
- uses: actions/checkout@v6
97-
- uses: ./.github/actions/setup-rust
98-
with:
99-
repo-token: ${{ secrets.GITHUB_TOKEN }}
100-
- name: Install uv
101-
uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
102-
with:
103-
sync: false
104-
prune-cache: false
105-
- name: Install Doxygen
106-
uses: ssciwr/doxygen-install@v1
90+
- uses: ./.github/actions/setup-prebuild
10791

10892
- name: Pytest - Vortex
10993
run: |
@@ -229,9 +213,6 @@ jobs:
229213
- name: Install wasm32 target
230214
if: ${{ matrix.config.target == 'wasm32-unknown-unknown' }}
231215
run: rustup target add wasm32-unknown-unknown
232-
- name: Install cargo-hack
233-
if: github.repository != 'vortex-data/vortex'
234-
uses: taiki-e/install-action@cargo-hack
235216
- uses: ./.github/actions/check-rebuild
236217
with:
237218
command: "${{matrix.config.env.rustflags}} cargo hack build --locked ${{matrix.config.args}} --ignore-private"
@@ -254,12 +235,6 @@ jobs:
254235
sccache: s3
255236
- uses: actions/checkout@v6
256237
- uses: ./.github/actions/setup-prebuild
257-
- name: Install cargo-hack
258-
if: github.repository != 'vortex-data/vortex'
259-
uses: taiki-e/install-action@cargo-hack
260-
- name: Install cargo-minimal-versions
261-
if: github.repository != 'vortex-data/vortex'
262-
uses: taiki-e/install-action@cargo-minimal-versions
263238
- run: cargo minimal-versions check --direct --workspace --ignore-private
264239

265240
rust-lint:
@@ -316,9 +291,6 @@ jobs:
316291
sccache: s3
317292
- uses: actions/checkout@v6
318293
- uses: ./.github/actions/setup-prebuild
319-
- name: Install cargo-hack
320-
if: github.repository != 'vortex-data/vortex'
321-
uses: taiki-e/install-action@cargo-hack
322294
- name: Rust Lint - Clippy No Default Features
323295
shell: bash
324296
run: |
@@ -383,14 +355,6 @@ jobs:
383355
sccache: s3
384356
- uses: actions/checkout@v6
385357
- uses: ./.github/actions/setup-prebuild
386-
- name: Install grcov
387-
if: github.repository != 'vortex-data/vortex'
388-
uses: taiki-e/install-action@grcov
389-
- name: Install nextest
390-
if: github.repository != 'vortex-data/vortex'
391-
uses: taiki-e/install-action@v2
392-
with:
393-
tool: nextest
394358
- name: Rust Tests
395359
if: ${{ matrix.suite == 'tests' }}
396360
run: |
@@ -442,21 +406,11 @@ jobs:
442406
with:
443407
sccache: s3
444408
- uses: actions/checkout@v6
445-
- name: Install llvm
446-
uses: aminya/setup-cpp@v1
447-
with:
448-
compiler: llvm
449-
cache-tools: true
450409
- uses: ./.github/actions/setup-prebuild
451410
- name: Install nightly for sanitizer
452411
run: |
453412
rustup toolchain install $NIGHTLY_TOOLCHAIN
454413
rustup component add --toolchain $NIGHTLY_TOOLCHAIN rust-src rustfmt clippy llvm-tools-preview
455-
- name: Install nextest
456-
if: github.repository != 'vortex-data/vortex'
457-
uses: taiki-e/install-action@v2
458-
with:
459-
tool: nextest
460414
- name: Rust Tests
461415
env:
462416
RUSTFLAGS: "-A warnings -Zsanitizer=address -Zsanitizer=leak --cfg disable_loom --cfg vortex_nightly -C debuginfo=2 -C opt-level=0 -C strip=none"
@@ -662,7 +616,7 @@ jobs:
662616
name: "Java"
663617
runs-on: >-
664618
${{ github.repository == 'vortex-data/vortex'
665-
&& format('runs-on={0}/runner=amd64-medium/tag=java', github.run_id)
619+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=java', github.run_id)
666620
|| 'ubuntu-latest' }}
667621
timeout-minutes: 120
668622
steps:
@@ -671,13 +625,7 @@ jobs:
671625
with:
672626
sccache: s3
673627
- uses: actions/checkout@v6
674-
- uses: actions/setup-java@v5
675-
with:
676-
distribution: "corretto"
677-
java-version: "17"
678-
- uses: ./.github/actions/setup-rust
679-
with:
680-
repo-token: ${{ secrets.GITHUB_TOKEN }}
628+
- uses: ./.github/actions/setup-prebuild
681629
- run: ./gradlew test --parallel
682630
working-directory: ./java
683631

@@ -783,11 +731,6 @@ jobs:
783731
sccache: s3
784732
- uses: actions/checkout@v6
785733
- uses: ./.github/actions/setup-prebuild
786-
- name: Install uv
787-
if: github.repository != 'vortex-data/vortex'
788-
uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
789-
with:
790-
sync: false
791734
- name: Run sqllogictest tests
792735
run: |
793736
./vortex-sqllogictest/slt/tpch/generate_data.sh

0 commit comments

Comments
 (0)