Skip to content

Commit 5c4adee

Browse files
committed
Tweaked win32 draft
1 parent 7b2ef45 commit 5c4adee

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/wheels.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ env:
2222
jobs:
2323
# ----- Windows build section
2424
build-windows:
25-
strategy:
26-
fail-fast: false
2725
runs-on: windows-latest
2826
steps:
2927
- name: Checkout repository
@@ -52,14 +50,15 @@ jobs:
5250
run: ${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.bat -disableMetrics
5351

5452
- name: Install vcpkg dependencies
53+
# Maybe use a matrix for the 32 and 64 bit build
5554
run: |
5655
${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x64-windows-static
56+
${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x86-windows-static
5757
58-
- name: Last build environment setup setps
58+
- name: Last build environment setup steps
5959
run: |
6060
call .venv\Scripts\activate.bat
6161
python automations/my_automator.py setup dev-env
62-
cibuildwheel .
6362
shell: cmd
6463

6564
- name: Build Win32 C extension
@@ -89,7 +88,6 @@ jobs:
8988
fail-fast: false
9089
matrix:
9190
os: [ macos-13, macos-14 ]
92-
python-version: [ "3.11" ]
9391
runs-on: ${{ matrix.os }}
9492
steps:
9593
- name: Checkout repository
@@ -142,8 +140,6 @@ jobs:
142140

143141
# ----- GNU Linux build section
144142
build-gnu-linux:
145-
strategy:
146-
fail-fast: false
147143
runs-on: ubuntu-22.04
148144
steps:
149145
- name: Checkout repository
@@ -188,7 +184,6 @@ jobs:
188184
run: |
189185
source .venv/bin/activate
190186
python automations/my_automator.py setup dev-env
191-
export CIBW_BEFORE_ALL="yum install -y perl perl-IPC-Cmd"
192187
cibuildwheel .
193188
194189
- name: Upload artifact

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,6 @@ test-command = "pytest {project}/tests/"
7474

7575
[tool.cibuildwheel.environment]
7676
VCPKG_ROOT = "{project}/vendor/vcpkg"
77+
78+
[tool.cibuildwheel.linux]
79+
before-all = "yum install -y perl perl-IPC-Cmd"

0 commit comments

Comments
 (0)