Skip to content

Commit 0574f59

Browse files
committed
Update cross compilation
1 parent 3bb56e6 commit 0574f59

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

.github/workflows/dist.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -90,28 +90,27 @@ jobs:
9090
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
9191
fail-fast: false
9292
matrix:
93-
# os: ["ubuntu-22.04", "macos-13", "windows-2022"]
94-
os: ["windows-2022"]
93+
os: ["ubuntu-22.04", "macos-13", "windows-2022"]
9594
python_version:
96-
# - '3.8'
95+
- '3.8'
9796
- '3.9'
98-
# - '3.10'
99-
# - '3.11'
100-
# - '3.12'
101-
# - '3.13'
97+
- '3.10'
98+
- '3.11'
99+
- '3.12'
100+
- '3.13'
102101
architecture: [x64]
103102
# exclude:
104103
# - os: macos-13
105104
# architecture: x86
106105
# - os: ubuntu-22.04
107106
# architecture: x86
108-
# include:
109-
# - os: macos-14
110-
# python_version: 3.9
111-
# architecture: arm64
112-
# - os: ubuntu-22.04-arm
113-
# python_version: 3.11
114-
# architecture: arm64
107+
include:
108+
- os: macos-14
109+
python_version: 3.9
110+
architecture: arm64
111+
- os: ubuntu-22.04-arm
112+
python_version: 3.11
113+
architecture: arm64
115114

116115
steps:
117116
- uses: actions/checkout@v3
@@ -162,7 +161,7 @@ jobs:
162161
matrix:
163162
container:
164163
- wpilib/roborio-cross-ubuntu:2025-22.04-py313
165-
- wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313
164+
# - wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313
166165

167166
container:
168167
image: "${{ matrix.container }}"
@@ -184,9 +183,8 @@ jobs:
184183
name: dist
185184
path: dist
186185

187-
- name: Install pkgconf
188-
run: |
189-
/build/venv/bin/build-pip --disable-pip-version-check install pkgconf
186+
- name: Setup cross environment
187+
uses: robotpy/build-actions/setup-cross-meson@semiwrap
190188

191189
- name: Install
192190
working-directory: dist
@@ -201,7 +199,7 @@ jobs:
201199
202200
- name: Build cross wheel
203201
working-directory: tests/cpp
204-
run: /build/venv/bin/cross-python run_install.py wheel
202+
run: /build/venv/bin/cross-python run_install.py --config-settings=setup-args=--cross-file=cross.txt
205203

206204
publish:
207205
runs-on: ubuntu-latest

tests/cpp/run_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ def subprocess_must_run(*args, **kwargs):
4444
"install",
4545
"--no-build-isolation",
4646
os.path.abspath(pkg),
47-
]
47+
] + sys.argv[1:]
4848
)

0 commit comments

Comments
 (0)