Skip to content

Commit 6b2d275

Browse files
committed
fix
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent 182c6da commit 6b2d275

2 files changed

Lines changed: 42 additions & 26 deletions

File tree

.github/workflows/compat-gen-upload.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,23 @@ on:
1313

1414
jobs:
1515
dry-run:
16-
runs-on: ubuntu-latest
16+
runs-on: >-
17+
${{ github.repository == 'vortex-data/vortex'
18+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=compat-gen-dry-run', github.run_id)
19+
|| 'ubuntu-latest' }}
1720
permissions:
1821
contents: read
1922
outputs:
2023
version: ${{ steps.detect.outputs.version }}
2124
steps:
22-
- uses: actions/checkout@v4
25+
- uses: runs-on/action@v2
26+
if: github.repository == 'vortex-data/vortex'
27+
with:
28+
sccache: s3
29+
- uses: actions/checkout@v6
2330
with:
2431
fetch-depth: 0
25-
26-
- uses: dtolnay/rust-toolchain@stable
27-
28-
- uses: Swatinem/rust-cache@v2
32+
- uses: ./.github/actions/setup-prebuild
2933

3034
- name: Detect version
3135
id: detect
@@ -43,7 +47,7 @@ jobs:
4347
- name: Dry run publish
4448
run: |
4549
GIT_REF="${{ inputs.git_ref }}"
46-
CMD="python3 vortex-test/compat-gen/scripts/compat.py publish --dry-run"
50+
CMD="uv run vortex-test/compat-gen/scripts/compat.py publish --dry-run"
4751
if [ -n "$GIT_REF" ]; then
4852
CMD="$CMD --git-ref $GIT_REF"
4953
fi
@@ -52,19 +56,23 @@ jobs:
5256
upload:
5357
needs: dry-run
5458
if: inputs.confirm_upload == 'yes'
55-
runs-on: ubuntu-latest
59+
runs-on: >-
60+
${{ github.repository == 'vortex-data/vortex'
61+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=compat-gen-upload', github.run_id)
62+
|| 'ubuntu-latest' }}
5663
environment: compat-upload
5764
permissions:
5865
id-token: write
5966
contents: read
6067
steps:
61-
- uses: actions/checkout@v4
68+
- uses: runs-on/action@v2
69+
if: github.repository == 'vortex-data/vortex'
70+
with:
71+
sccache: s3
72+
- uses: actions/checkout@v6
6273
with:
6374
fetch-depth: 0
64-
65-
- uses: dtolnay/rust-toolchain@stable
66-
67-
- uses: Swatinem/rust-cache@v2
75+
- uses: ./.github/actions/setup-prebuild
6876

6977
- name: Configure AWS credentials
7078
uses: aws-actions/configure-aws-credentials@v5
@@ -75,7 +83,7 @@ jobs:
7583
- name: Upload fixtures for v${{ needs.dry-run.outputs.version }}
7684
run: |
7785
GIT_REF="${{ inputs.git_ref }}"
78-
CMD="python3 vortex-test/compat-gen/scripts/compat.py publish --yes"
86+
CMD="uv run vortex-test/compat-gen/scripts/compat.py publish --yes"
7987
if [ -n "$GIT_REF" ]; then
8088
CMD="$CMD --git-ref $GIT_REF"
8189
fi

.github/workflows/compat-validation.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ name: Compat Validation
33
on:
44
schedule:
55
- cron: "0 6 * * 1" # Monday 6am UTC
6+
workflow_call:
7+
inputs:
8+
mode:
9+
description: "Validation mode"
10+
required: true
11+
default: "last"
12+
type: string
613
workflow_dispatch:
714
inputs:
815
mode:
@@ -14,21 +21,22 @@ on:
1421
- last
1522
- all
1623

17-
env:
18-
FIXTURES_URL: https://vortex-compat-fixtures.s3.amazonaws.com
19-
2024
jobs:
2125
compat-test:
22-
runs-on: ubuntu-latest
26+
runs-on: >-
27+
${{ github.repository == 'vortex-data/vortex'
28+
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=compat-validation', github.run_id)
29+
|| 'ubuntu-latest' }}
30+
timeout-minutes: 120
2331
steps:
24-
- uses: actions/checkout@v4
25-
26-
- uses: dtolnay/rust-toolchain@stable
27-
28-
- uses: Swatinem/rust-cache@v2
29-
32+
- uses: runs-on/action@v2
33+
if: github.repository == 'vortex-data/vortex'
34+
with:
35+
sccache: s3
36+
- uses: actions/checkout@v6
37+
- uses: ./.github/actions/setup-prebuild
3038
- name: Run compat tests
3139
run: |
3240
MODE="${{ inputs.mode || 'last' }}"
33-
python3 vortex-test/compat-gen/scripts/compat.py check \
34-
--mode "$MODE"
41+
uv run vortex-test/compat-gen/scripts/compat.py check \
42+
--versions "$MODE"

0 commit comments

Comments
 (0)