Skip to content

Commit 4cef2a0

Browse files
Fix win32 cross file + fix paths to cross files
1 parent d414544 commit 4cef2a0

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
CIBW_BUILD: "cp312-*"
120120
CIBW_ARCHS_WINDOWS: ARM64
121121
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
122-
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file=$PWD/meson_cross_files/windows-arm64.ini"
122+
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file={project}/meson_cross_files/windows-arm64.ini"
123123
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel}
124124
CIBW_TEST_SKIP: "*-win_arm64"
125125

@@ -155,7 +155,7 @@ jobs:
155155
CIBW_BUILD: "cp312-*"
156156
CIBW_ARCHS_WINDOWS: x86
157157
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
158-
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file=$PWD/meson_cross_files/windows-386.ini"
158+
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file={project}/meson_cross_files/windows-386.ini"
159159
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel}
160160
CIBW_TEST_COMMAND: |
161161
hugo version

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180

181181
- name: Build binary distribution (wheel) on Linux
182182
if: matrix.runs-on == 'ubuntu-latest'
183-
run: python -m build --wheel . --outdir wheelhouse -Csetup-args=--cross-file=$PWD/meson_cross_files/linux-arm64.ini
183+
run: python -m build --wheel . --outdir wheelhouse -Csetup-args=--cross-file="$GITHUB_WORKSPACE/meson_cross_files/linux-arm64.ini"
184184
# can't repair arm64 wheels on Linux x86_64 right now
185185
# auditwheel repair --plat manylinux_2_28_aarch64 -w wheelhouse/ dist/*.whl
186186

@@ -195,7 +195,7 @@ jobs:
195195
CIBW_BUILD: "cp312-*"
196196
CIBW_ARCHS_WINDOWS: ARM64
197197
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
198-
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file=$PWD/meson_cross_files/windows-arm64.ini"
198+
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file={project}/meson_cross_files/windows-arm64.ini"
199199
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel}
200200
CIBW_TEST_SKIP: "*-win_arm64"
201201

@@ -211,7 +211,7 @@ jobs:
211211
CIBW_BUILD: "cp312-*"
212212
CIBW_ARCHS_WINDOWS: x86
213213
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
214-
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file=$PWD/meson_cross_files/windows-686.ini"
214+
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--cross-file={project}/meson_cross_files/windows-386.ini"
215215
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel}
216216
CIBW_TEST_COMMAND: |
217217
hugo version

0 commit comments

Comments
 (0)