CI: Build and release on 32bit Windows Python

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>
pythongssapi · May 26, 2021 · 737330b · 737330b
1 parent 4f1c2e8
commit 737330b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,6 +66,10 @@
                         "win-py-3.7",
                         "win-py-3.6",
                     ],
+                    "arch": [
+                        "x64",
+                        "x86"
+                    ],
                     "include": [
                         {
                             "name": "win-py-3.9",
@@ -94,7 +98,10 @@
                 {
                     "name": "Install the right python",
                     "uses": "actions/setup-python@v2",
-                    "with": { "python-version": "${{ matrix.pyenv }}" },
+                    "with": {
+                        "python-version": "${{ matrix.pyenv }}",
+                        "architecture": "${{ matrix.arch }}"
+                    },
                 },
                 {
                     "name": "Build and test gssapi",

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -85,6 +85,10 @@
                         "win-wheel-3.7",
                         "win-wheel-3.6",
                     ],
+                    "arch": [
+                        "x64",
+                        "x86"
+                    ],
                     "include": [
                         {
                             "name": "win-wheel-3.9",
@@ -113,7 +117,10 @@
                 {
                     "name": "Install the right python",
                     "uses": "actions/setup-python@v2",
-                    "with": { "python-version": "${{ matrix.pyenv }}" },
+                    "with": {
+                        "python-version": "${{ matrix.pyenv }}",
+                        "architecture": "${{ matrix.arch }}"
+                    },
                 },
                 {
                     "name": "Create and upload Windows wheel",

diff --git a/ci/lib-setup.sh b/ci/lib-setup.sh
@@ -64,11 +64,19 @@ setup::macos::install() {
 setup::windows::install() {
     CHINST="choco install --no-progress --yes --ignore-detected-reboot --allow-downgrade"
 
+    # Install the 32bit version if Python is 32bit
+    if python -c "assert __import__('sys').maxsize <= 2**32"; then
+        CHINST="$CHINST --x86"
+        PF="Program Files (x86)"
+    else
+        PF="Program Files"
+    fi
+
     # Install MIT Kerberos.  choco will fail despite the installation working.
     $CHINST mitkerberos --install-arguments "'ADDLOCAL=ALL'" || true
 
     # Update path to include it
-    export PATH="/c/Program Files/MIT/Kerberos/bin:$PATH"
+    export PATH="/c/$PF/MIT/Kerberos/bin:$PATH"
 
     python -m pip install --upgrade pip
 }