Including x32 build

cvxopt · Aug 13, 2020 · 82acd20 · 82acd20
1 parent d4a01ea
commit 82acd20
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/.github/workflows/windows_build_mvsc.yml b/.github/workflows/windows_build_mvsc.yml
@@ -22,13 +22,23 @@ jobs:
       matrix:
         python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
         suite-sparse: [src_suitesparse]
+        ARCH: [x64, x86]
+        include:
+        - ARCH: x64
+          VC_TARGET: 64
+          PYTHON_TARGET: win-amd64
+        - ARCH: x86
+          VC_TARGET: 32
+          PYTHON_TARGET: win32
+
 
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.ARCH}}
 
       - name: Setup msys2
         uses: msys2/setup-msys2@v2
@@ -48,9 +58,9 @@ jobs:
 
       - name: Download openblas
         run: |
-            Invoke-WebRequest  https://github.com/xianyi/OpenBLAS/releases/download/v${{ env.OPENBLAS_VERSION }}/OpenBLAS-${{ env.OPENBLAS_VERSION }}-x64.zip -OutFile OpenBLAS-${{ env.OPENBLAS_VERSION }}-x64.zip
-            Expand-Archive OpenBLAS-${{ env.OPENBLAS_VERSION }}-x64.zip
-            echo "::set-env name=CVXOPT_BLAS_LIB_DIR::${{ github.workspace}}/OpenBLAS-${{ env.OPENBLAS_VERSION }}-x64/lib" 
+            Invoke-WebRequest  https://github.com/xianyi/OpenBLAS/releases/download/v${{ env.OPENBLAS_VERSION }}/OpenBLAS-${{ env.OPENBLAS_VERSION }}-${{ matrix.ARCH }}.zip -OutFile OpenBLAS-${{ env.OPENBLAS_VERSION }}-${{ matrix.ARCH }}.zip
+            Expand-Archive OpenBLAS-${{ env.OPENBLAS_VERSION }}-${{ matrix.ARCH }}.zip
+            echo "::set-env name=CVXOPT_BLAS_LIB_DIR::${{ github.workspace}}/OpenBLAS-${{ env.OPENBLAS_VERSION }}-${{ matrix.ARCH }}/lib" 
             echo "::set-env name=CVXOPT_LAPACK_LIB::libopenblas" 
             echo "::set-env name=CVXOPT_BLAS_LIB::libopenblas" 
 
@@ -70,16 +80,18 @@ jobs:
         shell: cmd
 
       - name: Cofigure Visual Studio 2019
-        if: ${{ matrix.python-version != '2.7' }}
+        if: ${{ matrix.python-version != '2.7'}}
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars${{ matrix.VC_TARGET }}.bat"
         shell: cmd
 
 
+
+
       - name: Install (windows)
         run: |
           python setup.py build
-          copy OpenBLAS-${{ env.OPENBLAS_VERSION }}-x64\bin\libopenblas.dll build\lib.win-amd64-${{ matrix.python-version}}\cvxopt
+          copy OpenBLAS-${{ env.OPENBLAS_VERSION }}-${{ matrix.ARCH }}\bin\libopenblas.dll build\lib.${{ matrix.PYTHON_TARGET }}-${{ matrix.python-version }}\cvxopt
           python setup.py bdist_wheel
           pip install .
         shell: cmd