Cross

Author: virtuald

.github/workflows/dist.yml

@@ -185,6 +185,7 @@ jobs:
 
     - name: Install deps
       run: |
+        python -m pip --disable-pip-version-check install ninja
         python -m pip --disable-pip-version-check install -r rdev_requirements.txt
 
     - name: Install numpy (needed for stubgen but broken in raspbian CI)
@@ -290,13 +291,12 @@ jobs:
     - name: Install deps
       shell: bash
       run: |
-        /build/venv/bin/build-pip --disable-pip-version-check install ninja pkgconf
         /build/venv/bin/cross-pip --disable-pip-version-check install -r rdev_requirements.txt
 
     - name: Build wheels
       shell: bash
       run: |
-        /build/venv/bin/cross-python -m devtools ci build-meson-wheels --no-test
+        /build/venv/bin/cross-python -m devtools ci build-meson-wheels --no-test --cross=cross.txt
       
 
     - uses: actions/upload-artifact@v4

devtools/ci.py

@@ -2,7 +2,9 @@
 # CI commands
 #
 
+import pathlib
 import sys
+import typing as T
 
 import click
 from packaging.requirements import Requirement
@@ -55,15 +57,17 @@ def build_other_wheels(ctx: Context, no_test: bool):
                 wheel_path=ctx.wheel_path,
                 other_wheel_path=ctx.other_wheel_path,
                 install=True,
+                config_settings=[],
             )
             if not no_test:
                 project.test(install_requirements=True)
 
 
 @ci.command()
 @click.option("--no-test", default=False, is_flag=True)
+@click.option("--cross", type=pathlib.Path, help="meson cross.txt file")
 @click.pass_obj
-def build_meson_wheels(ctx: Context, no_test: bool):
+def build_meson_wheels(ctx: Context, no_test: bool, cross: T.Optional[pathlib.Path]):
     """
     Builds wheels that use meson, runs tests.
 
@@ -81,6 +85,10 @@ def build_meson_wheels(ctx: Context, no_test: bool):
     # Check that the build dependencies match the versions of the projects
     # that we're building
 
+    config_settings = []
+    if cross:
+        config_settings.append("setup-args=--cross-file=" + str(cross.absolute()))
+
     for project in ctx.subprojects.values():
         if not project.is_meson_project():
             continue
@@ -93,6 +101,7 @@ def build_meson_wheels(ctx: Context, no_test: bool):
                 wheel_path=ctx.wheel_path,
                 other_wheel_path=ctx.other_wheel_path,
                 install=True,
+                config_settings=config_settings,
             )
             if not no_test:
                 project.test(install_requirements=True)

devtools/subproject.py

@@ -4,6 +4,7 @@
 import shutil
 import sys
 import tempfile
+import typing as T
 
 from packaging.requirements import Requirement
 import tomli
@@ -104,10 +105,17 @@ def test(self, *, install_requirements=False):
         )
 
     def build_wheel(
-        self, *, wheel_path: pathlib.Path, other_wheel_path: pathlib.Path, install: bool
+        self,
+        *,
+        wheel_path: pathlib.Path,
+        other_wheel_path: pathlib.Path,
+        install: bool,
+        config_settings: T.List[str],
     ):
         wheel_path.mkdir(parents=True, exist_ok=True)
 
+        config_args = [f"--config-setting={setting}" for setting in config_settings]
+
         # TODO: eventually it would be nice to use build isolation
 
         with tempfile.TemporaryDirectory() as td:
@@ -119,6 +127,7 @@ def build_wheel(
                 "--no-isolation",
                 "--outdir",
                 td,
+                *config_args,
                 cwd=self.path,
             )
 

rdev_requirements.txt

@@ -14,5 +14,4 @@ semiwrap @ git+https://github.com/robotpy/robotpy-build@semiwrap
 hatch-meson
 hatch-robotpy @ git+https://github.com/robotpy/hatch-robotpy@main
 hatch-nativelib @ git+https://github.com/robotpy/hatch-nativelib@rm-macos-relink
-ninja
 msvc-runtime>=14.42.34433; platform_system == 'Windows'