Skip to content

Commit 3577b95

Browse files
joseph-isaacsjoseph-isaacs
committed
fix
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent 27c36bb commit 3577b95

1 file changed

Lines changed: 22 additions & 49 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -244,17 +244,15 @@ jobs:
244244
timeout-minutes: 120
245245
runs-on: >-
246246
${{ github.repository == 'vortex-data/vortex'
247-
&& format('runs-on={0}/runner=amd64-medium/tag=rust-min-deps', github.run_id)
247+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=rust-min-deps', github.run_id)
248248
|| 'ubuntu-latest' }}
249249
steps:
250250
- uses: runs-on/action@v2
251251
if: github.repository == 'vortex-data/vortex'
252252
with:
253253
sccache: s3
254254
- uses: actions/checkout@v6
255-
- uses: ./.github/actions/setup-rust
256-
with:
257-
repo-token: ${{ secrets.GITHUB_TOKEN }}
255+
- uses: ./.github/actions/setup-prebuild
258256
- uses: taiki-e/install-action@cargo-hack
259257
- uses: taiki-e/install-action@cargo-minimal-versions
260258
- run: cargo minimal-versions check --direct --workspace --ignore-private
@@ -304,18 +302,15 @@ jobs:
304302
timeout-minutes: 120
305303
runs-on: >-
306304
${{ github.repository == 'vortex-data/vortex'
307-
&& format('runs-on={0}/runner=amd64-medium/tag=rust-lint-no-default', github.run_id)
305+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=rust-lint-no-default', github.run_id)
308306
|| 'ubuntu-latest' }}
309307
steps:
310308
- uses: runs-on/action@v2
311309
if: github.repository == 'vortex-data/vortex'
312310
with:
313311
sccache: s3
314312
- uses: actions/checkout@v6
315-
- id: setup-rust
316-
uses: ./.github/actions/setup-rust
317-
with:
318-
repo-token: ${{ secrets.GITHUB_TOKEN }}
313+
- uses: ./.github/actions/setup-prebuild
319314
- name: Install cargo-hack
320315
uses: taiki-e/install-action@cargo-hack
321316
- name: Rust Lint - Clippy No Default Features
@@ -328,18 +323,17 @@ jobs:
328323
timeout-minutes: 120
329324
runs-on: >-
330325
${{ github.repository == 'vortex-data/vortex'
331-
&& format('runs-on={0}/runner=amd64-xsmall/tag=public-api', github.run_id)
326+
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre/tag=public-api', github.run_id)
332327
|| 'ubuntu-latest' }}
333328
steps:
334329
- uses: runs-on/action@v2
335330
if: github.repository == 'vortex-data/vortex'
336331
with:
337332
sccache: s3
338333
- uses: actions/checkout@v6
339-
- uses: ./.github/actions/setup-rust
340-
with:
341-
repo-token: ${{ secrets.GITHUB_TOKEN }}
342-
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
334+
- uses: ./.github/actions/setup-prebuild
335+
- name: Install nightly for public-api
336+
run: rustup toolchain install $NIGHTLY_TOOLCHAIN
343337
- name: Regenerate public API lock files
344338
run: cargo +$NIGHTLY_TOOLCHAIN xtask public-api
345339
- name: Verify lock files are up to date
@@ -369,7 +363,7 @@ jobs:
369363
- suite: tests
370364
runs-on: >-
371365
${{ github.repository == 'vortex-data/vortex'
372-
&& format('runs-on={0}/runner=amd64-large/tag=rust-coverage-suite-{1}', github.run_id, matrix.suite)
366+
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre/tag=rust-coverage-suite-{1}', github.run_id, matrix.suite)
373367
|| 'ubuntu-latest' }}
374368
env:
375369
RUSTFLAGS: "-Cinstrument-coverage -A warnings"
@@ -382,10 +376,7 @@ jobs:
382376
with:
383377
sccache: s3
384378
- uses: actions/checkout@v6
385-
- id: setup-rust
386-
uses: ./.github/actions/setup-rust
387-
with:
388-
repo-token: ${{ secrets.GITHUB_TOKEN }}
379+
- uses: ./.github/actions/setup-prebuild
389380
- name: Install grcov
390381
uses: taiki-e/install-action@grcov
391382
- name: Install nextest
@@ -423,7 +414,7 @@ jobs:
423414
timeout-minutes: 120
424415
runs-on: >-
425416
${{ github.repository == 'vortex-data/vortex'
426-
&& format('runs-on={0}/runner=amd64-medium/tag=rust-test-sanitizer', github.run_id)
417+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=rust-test-sanitizer', github.run_id)
427418
|| 'ubuntu-latest' }}
428419
env:
429420
# Add debug symbols and enable ASAN/LSAN with better output
@@ -448,16 +439,9 @@ jobs:
448439
with:
449440
compiler: llvm
450441
cache-tools: true
451-
- id: setup-rust
452-
uses: ./.github/actions/setup-rust
453-
with:
454-
repo-token: ${{ secrets.GITHUB_TOKEN }}
455-
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
456-
components: "rust-src, rustfmt, clippy, llvm-tools-preview"
457-
- name: Install build dependencies
458-
run: |
459-
sudo apt-get update
460-
sudo apt-get install -y ninja-build cmake
442+
- uses: ./.github/actions/setup-prebuild
443+
- name: Install nightly for sanitizer
444+
run: rustup toolchain install $NIGHTLY_TOOLCHAIN --component rust-src rustfmt clippy llvm-tools-preview
461445
- name: Install nextest
462446
uses: taiki-e/install-action@v2
463447
with:
@@ -702,7 +686,7 @@ jobs:
702686
timeout-minutes: 120
703687
runs-on: >-
704688
${{ github.repository == 'vortex-data/vortex'
705-
&& format('runs-on={0}/runner=amd64-medium/tag=bench-codspeed-{1}', github.run_id, matrix.shard)
689+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=bench-codspeed-{1}', github.run_id, matrix.shard)
706690
|| 'ubuntu-latest' }}
707691
steps:
708692
- uses: runs-on/action@v2
@@ -712,9 +696,7 @@ jobs:
712696
- uses: actions/checkout@v6
713697
- name: Setup benchmark environment
714698
run: sudo bash scripts/setup-benchmark.sh
715-
- uses: ./.github/actions/setup-rust
716-
with:
717-
repo-token: ${{ secrets.GITHUB_TOKEN }}
699+
- uses: ./.github/actions/setup-prebuild
718700
- uses: ./.github/actions/system-info
719701
- name: Install Codspeed
720702
uses: taiki-e/cache-cargo-install-action@24c4eaa867646941dd8cd6f08c1497ea68d732ba
@@ -753,18 +735,15 @@ jobs:
753735
timeout-minutes: 120
754736
runs-on: >-
755737
${{ github.repository == 'vortex-data/vortex'
756-
&& format('runs-on={0}/runner=amd64-medium/tag=cxx-build', github.run_id)
738+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=cxx-build', github.run_id)
757739
|| 'ubuntu-latest' }}
758740
steps:
759741
- uses: runs-on/action@v2
760742
if: github.repository == 'vortex-data/vortex'
761743
with:
762744
sccache: s3
763745
- uses: actions/checkout@v6
764-
- id: setup-rust
765-
uses: ./.github/actions/setup-rust
766-
with:
767-
repo-token: ${{ secrets.GITHUB_TOKEN }}
746+
- uses: ./.github/actions/setup-prebuild
768747
- name: Build and run C++ unit tests
769748
run: |
770749
mkdir -p vortex-cxx/build
@@ -784,18 +763,15 @@ jobs:
784763
name: "SQL logic tests"
785764
runs-on: >-
786765
${{ github.repository == 'vortex-data/vortex'
787-
&& format('runs-on={0}/runner=amd64-medium/tag=sql-logic-test', github.run_id)
766+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=sql-logic-test', github.run_id)
788767
|| 'ubuntu-latest' }}
789768
steps:
790769
- uses: runs-on/action@v2
791770
if: github.repository == 'vortex-data/vortex'
792771
with:
793772
sccache: s3
794773
- uses: actions/checkout@v6
795-
- id: setup-rust
796-
uses: ./.github/actions/setup-rust
797-
with:
798-
repo-token: ${{ secrets.GITHUB_TOKEN }}
774+
- uses: ./.github/actions/setup-prebuild
799775
- name: Install uv
800776
uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
801777
with:
@@ -913,18 +889,15 @@ jobs:
913889
timeout-minutes: 120
914890
runs-on: >-
915891
${{ github.repository == 'vortex-data/vortex'
916-
&& format('runs-on={0}/runner=amd64-xsmall/tag=rust-publish-dry-run', github.run_id)
892+
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre/tag=rust-publish-dry-run', github.run_id)
917893
|| 'ubuntu-latest' }}
918894
steps:
919895
- uses: runs-on/action@v2
920896
if: github.repository == 'vortex-data/vortex'
921897
with:
922898
sccache: s3
923899
- uses: actions/checkout@v6
924-
- id: setup-rust
925-
uses: ./.github/actions/setup-rust
926-
with:
927-
repo-token: ${{ secrets.GITHUB_TOKEN }}
900+
- uses: ./.github/actions/setup-prebuild
928901
- name: Install cargo-edit
929902
uses: taiki-e/cache-cargo-install-action@24c4eaa867646941dd8cd6f08c1497ea68d732ba
930903
with:

0 commit comments

Comments
 (0)