fix: compat script (#7024)

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

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

@@ -13,19 +13,23 @@ on:
 
 jobs:
   dry-run:
-    runs-on: ubuntu-latest
+    runs-on: >-
+      ${{ github.repository == 'vortex-data/vortex'
+          && format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=compat-gen-dry-run', github.run_id)
+          || 'ubuntu-latest' }}
     permissions:
       contents: read
     outputs:
       version: ${{ steps.detect.outputs.version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: runs-on/action@v2
+        if: github.repository == 'vortex-data/vortex'
+        with:
+          sccache: s3
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-
-      - uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
+      - uses: ./.github/actions/setup-prebuild
 
       - name: Detect version
         id: detect
@@ -43,7 +47,7 @@ jobs:
       - name: Dry run publish
         run: |
           GIT_REF="${{ inputs.git_ref }}"
-          CMD="python3 vortex-test/compat-gen/scripts/compat.py publish --dry-run"
+          CMD="uv run vortex-test/compat-gen/scripts/compat.py publish --dry-run"
           if [ -n "$GIT_REF" ]; then
             CMD="$CMD --git-ref $GIT_REF"
           fi
@@ -52,19 +56,23 @@ jobs:
   upload:
     needs: dry-run
     if: inputs.confirm_upload == 'yes'
-    runs-on: ubuntu-latest
+    runs-on: >-
+      ${{ github.repository == 'vortex-data/vortex'
+          && format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=compat-gen-upload', github.run_id)
+          || 'ubuntu-latest' }}
     environment: compat-upload
     permissions:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: runs-on/action@v2
+        if: github.repository == 'vortex-data/vortex'
+        with:
+          sccache: s3
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-
-      - uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
+      - uses: ./.github/actions/setup-prebuild
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v5
@@ -75,7 +83,7 @@ jobs:
       - name: Upload fixtures for v${{ needs.dry-run.outputs.version }}
         run: |
           GIT_REF="${{ inputs.git_ref }}"
-          CMD="python3 vortex-test/compat-gen/scripts/compat.py publish --yes"
+          CMD="uv run vortex-test/compat-gen/scripts/compat.py publish --yes"
           if [ -n "$GIT_REF" ]; then
             CMD="$CMD --git-ref $GIT_REF"
           fi

.github/workflows/compat-validation.yml

@@ -15,17 +15,17 @@ on:
       mode:
         description: "Validation mode"
         required: true
-        default: "all"
+        default: "last"
         type: choice
         options:
-          - all
           - last
+          - all
 
 jobs:
   compat-test:
     runs-on: >-
       ${{ github.repository == 'vortex-data/vortex'
-          && format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre/tag=compat-validation', github.run_id)
+          && format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=compat-validation', github.run_id)
           || 'ubuntu-latest' }}
     timeout-minutes: 120
     steps:
@@ -35,12 +35,8 @@ jobs:
           sccache: s3
       - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-prebuild
-      - name: Install uv
-        uses: spiraldb/actions/.github/actions/setup-uv@0.18.5
-        with:
-          sync: false
       - name: Run compat tests
         run: |
-          MODE="${{ inputs.mode || 'all' }}"
+          MODE="${{ inputs.mode || 'last' }}"
           uv run vortex-test/compat-gen/scripts/compat.py check \
             --mode "$MODE"

vortex-test/compat-gen/scripts/compat.py

@@ -35,10 +35,11 @@
 import subprocess
 import sys
 import tempfile
+import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import UTC, datetime
 from pathlib import Path
-from urllib.error import HTTPError
+from urllib.error import HTTPError, URLError
 from urllib.request import urlopen
 
 import jsonschema
@@ -169,13 +170,19 @@ def __init__(self, bucket: str):
 
     def read(self, key: str) -> bytes | None:
         url = f"{self.https_base}/{key}"
-        try:
-            with urlopen(url) as resp:
-                return resp.read()
-        except HTTPError as e:
-            if e.code in (403, 404):
-                return None
-            raise
+        for attempt in range(3):
+            try:
+                with urlopen(url, timeout=10) as resp:
+                    return resp.read()
+            except HTTPError as e:
+                if e.code in (403, 404):
+                    return None
+                raise
+            except (URLError, ConnectionError, TimeoutError):
+                if attempt < 2:
+                    time.sleep(1 * (attempt + 1))
+                    continue
+                raise
 
     def write(self, key: str, data: bytes) -> None:
         with tempfile.NamedTemporaryFile(delete=False) as f: