Skip to content

Commit 5ff6443

Browse files
committed
Add zip package to cibuildwheel manylinux container
1 parent 5c4adee commit 5ff6443

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

.github/workflows/wheels.yaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ env:
2222
jobs:
2323
# ----- Windows build section
2424
build-windows:
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
win_arch: ['x86', 'x64']
2529
runs-on: windows-latest
2630
steps:
2731
- name: Checkout repository
@@ -49,27 +53,19 @@ jobs:
4953
- name: Bootstrap vcpkg
5054
run: ${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.bat -disableMetrics
5155

52-
- name: Install vcpkg dependencies
53-
# Maybe use a matrix for the 32 and 64 bit build
56+
- name: Build x86 C extension
57+
if: ${{ matrix.win_arch }} == 'x86'
5458
run: |
55-
${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x64-windows-static
5659
${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x86-windows-static
57-
58-
- name: Last build environment setup steps
59-
run: |
60-
call .venv\Scripts\activate.bat
61-
python automations/my_automator.py setup dev-env
62-
shell: cmd
63-
64-
- name: Build Win32 C extension
65-
run: |
6660
call .venv\Scripts\activate.bat
6761
set WIN_ARCH='x86'
6862
cibuildwheel . --platform windows --archs x86
6963
shell: cmd
7064

71-
- name: Build Win64 C extension
65+
- name: Build x64 C extension
66+
if: ${{ matrix.win_arch }} == 'x64'
7267
run: |
68+
${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x64-windows-static
7369
call .venv\Scripts\activate.bat
7470
set WIN_ARCH='x64'
7571
cibuildwheel . --platform windows --archs AMD64
@@ -78,7 +74,7 @@ jobs:
7874
- name: Upload artifact
7975
uses: actions/upload-artifact@v4
8076
with:
81-
name: PyMOL-wheel-Windows-3.11
77+
name: PyMOL-wheel-Windows-${{ matrix.win_arch }}-3.11
8278
path: ./wheelhouse/*.whl
8379
# --- end
8480

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ pymol2 = "modules/pymol2"
6464
"pymol/data" = "data"
6565

6666
[tool.cibuildwheel]
67-
build = ["cp310-*", "cp311-*", "cp312-*"]
68-
# build = ["cp311-*"] # Only for debug purposes
67+
#build = ["cp310-*", "cp311-*", "cp312-*"]
68+
build = ["cp311-*"] # Only for debug purposes
6969
# Skip 32-bit builds
7070
#skip = ["*-win32", "*-manylinux_i686"]
7171
skip = ["*-manylinux_i686"]
@@ -76,4 +76,4 @@ test-command = "pytest {project}/tests/"
7676
VCPKG_ROOT = "{project}/vendor/vcpkg"
7777

7878
[tool.cibuildwheel.linux]
79-
before-all = "yum install -y perl perl-IPC-Cmd"
79+
before-all = "yum install -y perl perl-IPC-Cmd zip"

0 commit comments

Comments
 (0)