Merge branch 'master' into tinygrad-sync-4/25

.github/workflows/cereal_validation.yaml

@@ -23,56 +23,43 @@ env:
   CI: 1
 
 jobs:
-  generate_cereal_artifact:
-    name: Generate cereal validation artifacts
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          submodules: true
-      - run: ./tools/op.sh setup
-      - name: Build openpilot
-        run: scons -j$(nproc) cereal
-      - name: Dump sunnypilot schema
-        run: |
-          export PYTHONPATH=${{ github.workspace }}
-          python3 cereal/messaging/tests/validate_sp_cereal_upstream.py -g -f schema.json
-      - name: 'Prepare artifact'
-        run: |
-          mkdir -p "cereal/messaging/tests/cereal_validations"
-          cp cereal/messaging/tests/validate_sp_cereal_upstream.py "cereal/messaging/tests/cereal_validations/validate_sp_cereal_upstream.py"
-          cp schema.json "cereal/messaging/tests/cereal_validations/schema.json"
-      - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v4
-        with:
-          name: cereal_validations
-          path: cereal/messaging/tests/cereal_validations
-
   validate_cereal_with_upstream:
     name: Validate cereal with Upstream
     runs-on: ubuntu-24.04
-    needs: generate_cereal_artifact
     steps:
-      - name: Checkout sunnypilot
+      - name: Checkout sunnypilot cereal
         uses: actions/checkout@v6
-      - name: Checkout upstream openpilot
+        with:
+          sparse-checkout: cereal
+
+      - name: Init sunnypilot opendbc submodule
+        run: git submodule update --init --depth 1 opendbc_repo
+
+      - name: Checkout upstream openpilot cereal
         uses: actions/checkout@v6
         with:
           repository: 'commaai/openpilot'
-          path: openpilot
-          submodules: true
+          path: upstream_openpilot
+          sparse-checkout: cereal
           ref: "refs/heads/master"
-      - run: ./tools/op.sh setup
-      - name: Build openpilot
-        working-directory: openpilot
-        run: scons -j$(nproc) cereal
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: cereal_validations
-          path: openpilot/cereal/messaging/tests/cereal_validations
-      - name: 'Validate sunnypilot schema against upstream'
+
+      - name: Init upstream opendbc submodule
+        working-directory: upstream_openpilot
+        run: git submodule update --init --depth 1 opendbc_repo
+
+      - name: Install uv
+        run: pip install uv
+
+      - name: Generate sunnypilot schema
         run: |
-          export PYTHONPATH=${{ github.workspace }}/openpilot
-          chmod +x openpilot/cereal/messaging/tests/cereal_validations/validate_sp_cereal_upstream.py
-          python3 openpilot/cereal/messaging/tests/cereal_validations/validate_sp_cereal_upstream.py -r -f openpilot/cereal/messaging/tests/cereal_validations/schema.json
+          PYCAPNP_VER=$(python3 -c "import re; m=re.search(r'name = \"pycapnp\"\nversion = \"([^\"]+)\"', open('uv.lock').read()); print(m.group(1))")
+          uv run --isolated --with "pycapnp==${PYCAPNP_VER}" \
+            python3 cereal/messaging/tests/validate_sp_cereal_upstream.py \
+            -g -f /tmp/sp_schema.json --cereal-dir cereal
+
+      - name: Validate against upstream
+        run: |
+          PYCAPNP_VER=$(python3 -c "import re; m=re.search(r'name = \"pycapnp\"\nversion = \"([^\"]+)\"', open('uv.lock').read()); print(m.group(1))")
+          uv run --isolated --with "pycapnp==${PYCAPNP_VER}" \
+            python3 cereal/messaging/tests/validate_sp_cereal_upstream.py \
+            -r -f /tmp/sp_schema.json --cereal-dir upstream_openpilot/cereal