Skip to content

Commit c7893d4

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

1 file changed

Lines changed: 25 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
timeout-minutes: 120
175175
runs-on: >-
176176
${{ github.repository == 'vortex-data/vortex'
177-
&& format('runs-on={0}/runner=amd64-small/image=ubuntu24-full-x64-pre/tag=rust-docs', github.run_id)
177+
&& format('runs-on={0}/runner=amd64-small/image=ubuntu24-full-x64-pre-v2/tag=rust-docs', github.run_id)
178178
|| 'ubuntu-latest' }}
179179
steps:
180180
- uses: runs-on/action@v2
@@ -194,7 +194,7 @@ jobs:
194194
timeout-minutes: 120
195195
runs-on: >-
196196
${{ 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)
197+
&& format('runs-on={0}/runner={1}/image=ubuntu24-full-x64-pre-v2/tag={2}', github.run_id, matrix.config.runner, matrix.config.name)
198198
|| 'ubuntu-latest' }}
199199
env:
200200
# disable lints for build, they will be caught in Rust lint job.
@@ -230,6 +230,7 @@ jobs:
230230
if: ${{ matrix.config.target == 'wasm32-unknown-unknown' }}
231231
run: rustup target add wasm32-unknown-unknown
232232
- name: Install cargo-hack
233+
if: github.repository != 'vortex-data/vortex'
233234
uses: taiki-e/install-action@cargo-hack
234235
- uses: ./.github/actions/check-rebuild
235236
with:
@@ -244,7 +245,7 @@ jobs:
244245
timeout-minutes: 120
245246
runs-on: >-
246247
${{ 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)
248+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=rust-min-deps', github.run_id)
248249
|| 'ubuntu-latest' }}
249250
steps:
250251
- uses: runs-on/action@v2
@@ -253,16 +254,20 @@ jobs:
253254
sccache: s3
254255
- uses: actions/checkout@v6
255256
- uses: ./.github/actions/setup-prebuild
256-
- uses: taiki-e/install-action@cargo-hack
257-
- uses: taiki-e/install-action@cargo-minimal-versions
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
258263
- run: cargo minimal-versions check --direct --workspace --ignore-private
259264

260265
rust-lint:
261266
name: "Rust (lint)"
262267
timeout-minutes: 120
263268
runs-on: >-
264269
${{ github.repository == 'vortex-data/vortex'
265-
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre/tag=rust-lint', github.run_id)
270+
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre-v2/tag=rust-lint', github.run_id)
266271
|| 'ubuntu-latest' }}
267272
steps:
268273
- uses: runs-on/action@v2
@@ -302,7 +307,7 @@ jobs:
302307
timeout-minutes: 120
303308
runs-on: >-
304309
${{ 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)
310+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=rust-lint-no-default', github.run_id)
306311
|| 'ubuntu-latest' }}
307312
steps:
308313
- uses: runs-on/action@v2
@@ -312,6 +317,7 @@ jobs:
312317
- uses: actions/checkout@v6
313318
- uses: ./.github/actions/setup-prebuild
314319
- name: Install cargo-hack
320+
if: github.repository != 'vortex-data/vortex'
315321
uses: taiki-e/install-action@cargo-hack
316322
- name: Rust Lint - Clippy No Default Features
317323
shell: bash
@@ -323,7 +329,7 @@ jobs:
323329
timeout-minutes: 120
324330
runs-on: >-
325331
${{ github.repository == 'vortex-data/vortex'
326-
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre/tag=public-api', github.run_id)
332+
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre-v2/tag=public-api', github.run_id)
327333
|| 'ubuntu-latest' }}
328334
steps:
329335
- uses: runs-on/action@v2
@@ -363,7 +369,7 @@ jobs:
363369
- suite: tests
364370
runs-on: >-
365371
${{ 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)
372+
&& format('runs-on={0}/runner=amd64-large/image=ubuntu24-full-x64-pre-v2/tag=rust-coverage-suite-{1}', github.run_id, matrix.suite)
367373
|| 'ubuntu-latest' }}
368374
env:
369375
RUSTFLAGS: "-Cinstrument-coverage -A warnings"
@@ -378,8 +384,10 @@ jobs:
378384
- uses: actions/checkout@v6
379385
- uses: ./.github/actions/setup-prebuild
380386
- name: Install grcov
387+
if: github.repository != 'vortex-data/vortex'
381388
uses: taiki-e/install-action@grcov
382389
- name: Install nextest
390+
if: github.repository != 'vortex-data/vortex'
383391
uses: taiki-e/install-action@v2
384392
with:
385393
tool: nextest
@@ -414,7 +422,7 @@ jobs:
414422
timeout-minutes: 120
415423
runs-on: >-
416424
${{ 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)
425+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=rust-test-sanitizer', github.run_id)
418426
|| 'ubuntu-latest' }}
419427
env:
420428
# Add debug symbols and enable ASAN/LSAN with better output
@@ -445,6 +453,7 @@ jobs:
445453
rustup toolchain install $NIGHTLY_TOOLCHAIN
446454
rustup component add --toolchain $NIGHTLY_TOOLCHAIN rust-src rustfmt clippy llvm-tools-preview
447455
- name: Install nextest
456+
if: github.repository != 'vortex-data/vortex'
448457
uses: taiki-e/install-action@v2
449458
with:
450459
tool: nextest
@@ -604,7 +613,7 @@ jobs:
604613
runner: runs-on=${{ github.run_id }}/pool=windows-x64-pre
605614
fallback_runner: windows-latest
606615
- os: linux-arm64
607-
runner: runs-on=${{ github.run_id }}/runner=arm64-medium/image=ubuntu24-full-arm64-pre/tag=rust-test-linux-arm64
616+
runner: runs-on=${{ github.run_id }}/runner=arm64-medium/image=ubuntu24-full-arm64-pre-v2/tag=rust-test-linux-arm64
608617
runs-on: >-
609618
${{ github.repository == 'vortex-data/vortex'
610619
&& matrix.runner
@@ -688,7 +697,7 @@ jobs:
688697
timeout-minutes: 120
689698
runs-on: >-
690699
${{ 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)
700+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=bench-codspeed-{1}', github.run_id, matrix.shard)
692701
|| 'ubuntu-latest' }}
693702
steps:
694703
- uses: runs-on/action@v2
@@ -737,7 +746,7 @@ jobs:
737746
timeout-minutes: 120
738747
runs-on: >-
739748
${{ github.repository == 'vortex-data/vortex'
740-
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=cxx-build', github.run_id)
749+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=cxx-build', github.run_id)
741750
|| 'ubuntu-latest' }}
742751
steps:
743752
- uses: runs-on/action@v2
@@ -765,7 +774,7 @@ jobs:
765774
name: "SQL logic tests"
766775
runs-on: >-
767776
${{ 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)
777+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=sql-logic-test', github.run_id)
769778
|| 'ubuntu-latest' }}
770779
steps:
771780
- uses: runs-on/action@v2
@@ -775,6 +784,7 @@ jobs:
775784
- uses: actions/checkout@v6
776785
- uses: ./.github/actions/setup-prebuild
777786
- name: Install uv
787+
if: github.repository != 'vortex-data/vortex'
778788
uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
779789
with:
780790
sync: false
@@ -891,7 +901,7 @@ jobs:
891901
timeout-minutes: 120
892902
runs-on: >-
893903
${{ 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)
904+
&& format('runs-on={0}/runner=amd64-xsmall/image=ubuntu24-full-x64-pre-v2/tag=rust-publish-dry-run', github.run_id)
895905
|| 'ubuntu-latest' }}
896906
steps:
897907
- uses: runs-on/action@v2

0 commit comments

Comments
 (0)