Skip to content

Commit 7cf49a1

Browse files
chore[ci]: use pre-build image and strip workflow installs (#7013)
Uses a new prebuild image with deps changed around. I will remove the v2 after merging and simplify --------- Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent 904079c commit 7cf49a1

1 file changed

Lines changed: 20 additions & 69 deletions

File tree

.github/workflows/ci.yml

Lines changed: 20 additions & 69 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: |
@@ -174,7 +158,7 @@ jobs:
174158
timeout-minutes: 120
175159
runs-on: >-
176160
${{ github.repository == 'vortex-data/vortex'
177-
&& format('runs-on={0}/runner=amd64-small/image=ubuntu24-full-x64-pre/tag=rust-docs', github.run_id)
161+
&& format('runs-on={0}/runner=amd64-small/image=ubuntu24-full-x64-pre-v2/tag=rust-docs', github.run_id)
178162
|| 'ubuntu-latest' }}
179163
steps:
180164
- uses: runs-on/action@v2
@@ -194,7 +178,7 @@ jobs:
194178
timeout-minutes: 120
195179
runs-on: >-
196180
${{ github.repository == 'vortex-data/vortex'
197-
&& format('runs-on={0}/runner={1}/image=ubuntu24-full-x64-pre/tag={2}', github.run_id, matrix.config.runner, matrix.config.name)
181+
&& format('runs-on={0}/runner={1}/image=ubuntu24-full-x64-pre-v2/tag={2}', github.run_id, matrix.config.runner, matrix.config.name)
198182
|| 'ubuntu-latest' }}
199183
env:
200184
# disable lints for build, they will be caught in Rust lint job.
@@ -229,8 +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-
uses: taiki-e/install-action@cargo-hack
234216
- uses: ./.github/actions/check-rebuild
235217
with:
236218
command: "${{matrix.config.env.rustflags}} cargo hack build --locked ${{matrix.config.args}} --ignore-private"
@@ -244,7 +226,7 @@ jobs:
244226
timeout-minutes: 120
245227
runs-on: >-
246228
${{ github.repository == 'vortex-data/vortex'
247-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=rust-min-deps', github.run_id)
229+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=rust-min-deps', github.run_id)
248230
|| 'ubuntu-latest' }}
249231
steps:
250232
- uses: runs-on/action@v2
@@ -253,16 +235,14 @@ jobs:
253235
sccache: s3
254236
- uses: actions/checkout@v6
255237
- uses: ./.github/actions/setup-prebuild
256-
- uses: taiki-e/install-action@cargo-hack
257-
- uses: taiki-e/install-action@cargo-minimal-versions
258238
- run: cargo minimal-versions check --direct --workspace --ignore-private
259239

260240
rust-lint:
261241
name: "Rust (lint)"
262242
timeout-minutes: 120
263243
runs-on: >-
264244
${{ github.repository == 'vortex-data/vortex'
265-
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre/tag=rust-lint', github.run_id)
245+
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre-v2/tag=rust-lint', github.run_id)
266246
|| 'ubuntu-latest' }}
267247
steps:
268248
- uses: runs-on/action@v2
@@ -302,7 +282,7 @@ jobs:
302282
timeout-minutes: 120
303283
runs-on: >-
304284
${{ github.repository == 'vortex-data/vortex'
305-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=rust-lint-no-default', github.run_id)
285+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=rust-lint-no-default', github.run_id)
306286
|| 'ubuntu-latest' }}
307287
steps:
308288
- uses: runs-on/action@v2
@@ -311,8 +291,6 @@ jobs:
311291
sccache: s3
312292
- uses: actions/checkout@v6
313293
- uses: ./.github/actions/setup-prebuild
314-
- name: Install cargo-hack
315-
uses: taiki-e/install-action@cargo-hack
316294
- name: Rust Lint - Clippy No Default Features
317295
shell: bash
318296
run: |
@@ -323,7 +301,7 @@ jobs:
323301
timeout-minutes: 120
324302
runs-on: >-
325303
${{ github.repository == 'vortex-data/vortex'
326-
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre/tag=public-api', github.run_id)
304+
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre-v2/tag=public-api', github.run_id)
327305
|| 'ubuntu-latest' }}
328306
steps:
329307
- uses: runs-on/action@v2
@@ -363,7 +341,7 @@ jobs:
363341
- suite: tests
364342
runs-on: >-
365343
${{ github.repository == 'vortex-data/vortex'
366-
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre/tag=rust-coverage-suite-{1}', github.run_id, matrix.suite)
344+
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre-v2/tag=rust-coverage-suite-{1}', github.run_id, matrix.suite)
367345
|| 'ubuntu-latest' }}
368346
env:
369347
RUSTFLAGS: "-Cinstrument-coverage -A warnings"
@@ -377,18 +355,10 @@ jobs:
377355
sccache: s3
378356
- uses: actions/checkout@v6
379357
- uses: ./.github/actions/setup-prebuild
380-
- name: Install grcov
381-
uses: taiki-e/install-action@grcov
382-
- name: Install nextest
383-
uses: taiki-e/install-action@v2
384-
with:
385-
tool: nextest
386358
- name: Rust Tests
387359
if: ${{ matrix.suite == 'tests' }}
388360
run: |
389361
cargo nextest run --locked --workspace --all-features --no-fail-fast
390-
- name: Install llvm-tools-preview
391-
run: rustup component add llvm-tools-preview
392362
- name: Generate coverage report
393363
run: |
394364
grcov . --binary-path target/debug/ -s . -t lcov --llvm --ignore-not-existing \
@@ -414,7 +384,7 @@ jobs:
414384
timeout-minutes: 120
415385
runs-on: >-
416386
${{ github.repository == 'vortex-data/vortex'
417-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=rust-test-sanitizer', github.run_id)
387+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=rust-test-sanitizer', github.run_id)
418388
|| 'ubuntu-latest' }}
419389
env:
420390
# Add debug symbols and enable ASAN/LSAN with better output
@@ -434,20 +404,11 @@ jobs:
434404
with:
435405
sccache: s3
436406
- uses: actions/checkout@v6
437-
- name: Install llvm
438-
uses: aminya/setup-cpp@v1
439-
with:
440-
compiler: llvm
441-
cache-tools: true
442407
- uses: ./.github/actions/setup-prebuild
443408
- name: Install nightly for sanitizer
444409
run: |
445410
rustup toolchain install $NIGHTLY_TOOLCHAIN
446411
rustup component add --toolchain $NIGHTLY_TOOLCHAIN rust-src rustfmt clippy llvm-tools-preview
447-
- name: Install nextest
448-
uses: taiki-e/install-action@v2
449-
with:
450-
tool: nextest
451412
- name: Rust Tests
452413
env:
453414
RUSTFLAGS: "-A warnings -Zsanitizer=address -Zsanitizer=leak --cfg disable_loom --cfg vortex_nightly -C debuginfo=2 -C opt-level=0 -C strip=none"
@@ -604,7 +565,7 @@ jobs:
604565
runner: runs-on=${{ github.run_id }}/pool=windows-x64-pre
605566
fallback_runner: windows-latest
606567
- os: linux-arm64
607-
runner: runs-on=${{ github.run_id }}/runner=arm64-medium/image=ubuntu24-full-arm64-pre/tag=rust-test-linux-arm64
568+
runner: runs-on=${{ github.run_id }}/runner=arm64-medium/image=ubuntu24-full-arm64-pre-v2/tag=rust-test-linux-arm64
608569
runs-on: >-
609570
${{ github.repository == 'vortex-data/vortex'
610571
&& matrix.runner
@@ -614,7 +575,7 @@ jobs:
614575
if: github.repository == 'vortex-data/vortex'
615576
with:
616577
sccache: s3
617-
- uses: actions/checkout@v5
578+
- uses: actions/checkout@v6
618579
- name: Setup (Windows)
619580
if: matrix.os == 'windows-x64'
620581
run: |
@@ -653,7 +614,7 @@ jobs:
653614
name: "Java"
654615
runs-on: >-
655616
${{ github.repository == 'vortex-data/vortex'
656-
&& format('runs-on={0}/runner=amd64-medium/tag=java', github.run_id)
617+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=java', github.run_id)
657618
|| 'ubuntu-latest' }}
658619
timeout-minutes: 120
659620
steps:
@@ -662,13 +623,7 @@ jobs:
662623
with:
663624
sccache: s3
664625
- uses: actions/checkout@v6
665-
- uses: actions/setup-java@v5
666-
with:
667-
distribution: "corretto"
668-
java-version: "17"
669-
- uses: ./.github/actions/setup-rust
670-
with:
671-
repo-token: ${{ secrets.GITHUB_TOKEN }}
626+
- uses: ./.github/actions/setup-prebuild
672627
- run: ./gradlew test --parallel
673628
working-directory: ./java
674629

@@ -688,7 +643,7 @@ jobs:
688643
timeout-minutes: 120
689644
runs-on: >-
690645
${{ github.repository == 'vortex-data/vortex'
691-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=bench-codspeed-{1}', github.run_id, matrix.shard)
646+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=bench-codspeed-{1}', github.run_id, matrix.shard)
692647
|| 'ubuntu-latest' }}
693648
steps:
694649
- uses: runs-on/action@v2
@@ -737,7 +692,7 @@ jobs:
737692
timeout-minutes: 120
738693
runs-on: >-
739694
${{ github.repository == 'vortex-data/vortex'
740-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=cxx-build', github.run_id)
695+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=cxx-build', github.run_id)
741696
|| 'ubuntu-latest' }}
742697
steps:
743698
- uses: runs-on/action@v2
@@ -765,7 +720,7 @@ jobs:
765720
name: "SQL logic tests"
766721
runs-on: >-
767722
${{ github.repository == 'vortex-data/vortex'
768-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=sql-logic-test', github.run_id)
723+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=sql-logic-test', github.run_id)
769724
|| 'ubuntu-latest' }}
770725
steps:
771726
- uses: runs-on/action@v2
@@ -774,10 +729,6 @@ jobs:
774729
sccache: s3
775730
- uses: actions/checkout@v6
776731
- uses: ./.github/actions/setup-prebuild
777-
- name: Install uv
778-
uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
779-
with:
780-
sync: false
781732
- name: Run sqllogictest tests
782733
run: |
783734
./vortex-sqllogictest/slt/tpch/generate_data.sh
@@ -891,7 +842,7 @@ jobs:
891842
timeout-minutes: 120
892843
runs-on: >-
893844
${{ github.repository == 'vortex-data/vortex'
894-
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre/tag=rust-publish-dry-run', github.run_id)
845+
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre-v2/tag=rust-publish-dry-run', github.run_id)
895846
|| 'ubuntu-latest' }}
896847
steps:
897848
- uses: runs-on/action@v2

0 commit comments

Comments
 (0)