|
22 | 22 | jobs:
|
23 | 23 | # ----- Windows build section
|
24 | 24 | build-windows:
|
| 25 | + strategy: |
| 26 | + fail-fast: false |
| 27 | + matrix: |
| 28 | + win_arch: ['x86', 'x64'] |
25 | 29 | runs-on: windows-latest
|
26 | 30 | steps:
|
27 | 31 | - name: Checkout repository
|
@@ -49,27 +53,19 @@ jobs:
|
49 | 53 | - name: Bootstrap vcpkg
|
50 | 54 | run: ${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.bat -disableMetrics
|
51 | 55 |
|
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' |
54 | 58 | run: |
|
55 |
| - ${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x64-windows-static |
56 | 59 | ${{ 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: | |
66 | 60 | call .venv\Scripts\activate.bat
|
67 | 61 | set WIN_ARCH='x86'
|
68 | 62 | cibuildwheel . --platform windows --archs x86
|
69 | 63 | shell: cmd
|
70 | 64 |
|
71 |
| - - name: Build Win64 C extension |
| 65 | + - name: Build x64 C extension |
| 66 | + if: ${{ matrix.win_arch }} == 'x64' |
72 | 67 | run: |
|
| 68 | + ${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x64-windows-static |
73 | 69 | call .venv\Scripts\activate.bat
|
74 | 70 | set WIN_ARCH='x64'
|
75 | 71 | cibuildwheel . --platform windows --archs AMD64
|
|
78 | 74 | - name: Upload artifact
|
79 | 75 | uses: actions/upload-artifact@v4
|
80 | 76 | with:
|
81 |
| - name: PyMOL-wheel-Windows-3.11 |
| 77 | + name: PyMOL-wheel-Windows-${{ matrix.win_arch }}-3.11 |
82 | 78 | path: ./wheelhouse/*.whl
|
83 | 79 | # --- end
|
84 | 80 |
|
|
0 commit comments