File tree Expand file tree Collapse file tree 3 files changed +25
-3
lines changed Expand file tree Collapse file tree 3 files changed +25
-3
lines changed Original file line number Diff line number Diff line change 6666 " win-py-3.7" ,
6767 " win-py-3.6" ,
6868 ],
69+ " arch " : [
70+ " x64" ,
71+ " x86"
72+ ],
6973 " include " : [
7074 {
7175 " name " : " win-py-3.9" ,
9498 {
9599 " name " : " Install the right python" ,
96100 " uses " : " actions/setup-python@v2" ,
97- " with " : { "python-version": "${{ matrix.pyenv }}" },
101+ " with " : {
102+ " python-version " : " ${{ matrix.pyenv }}" ,
103+ " architecture " : " ${{ matrix.arch }}"
104+ },
98105 },
99106 {
100107 " name " : " Build and test gssapi" ,
Original file line number Diff line number Diff line change 8585 " win-wheel-3.7" ,
8686 " win-wheel-3.6" ,
8787 ],
88+ " arch " : [
89+ " x64" ,
90+ " x86"
91+ ],
8892 " include " : [
8993 {
9094 " name " : " win-wheel-3.9" ,
113117 {
114118 " name " : " Install the right python" ,
115119 " uses " : " actions/setup-python@v2" ,
116- " with " : { "python-version": "${{ matrix.pyenv }}" },
120+ " with " : {
121+ " python-version " : " ${{ matrix.pyenv }}" ,
122+ " architecture " : " ${{ matrix.arch }}"
123+ },
117124 },
118125 {
119126 " name " : " Create and upload Windows wheel" ,
Original file line number Diff line number Diff line change @@ -64,11 +64,19 @@ setup::macos::install() {
6464setup::windows::install () {
6565 CHINST=" choco install --no-progress --yes --ignore-detected-reboot --allow-downgrade"
6666
67+ # Install the 32bit version if Python is 32bit
68+ if python -c " assert __import__('sys').maxsize <= 2**32" ; then
69+ CHINST=" $CHINST --x86"
70+ PF=" Program Files (x86)"
71+ else
72+ PF=" Program Files"
73+ fi
74+
6775 # Install MIT Kerberos. choco will fail despite the installation working.
6876 $CHINST mitkerberos --install-arguments " 'ADDLOCAL=ALL'" || true
6977
7078 # Update path to include it
71- export PATH=" /c/Program Files /MIT/Kerberos/bin:$PATH "
79+ export PATH=" /c/$PF /MIT/Kerberos/bin:$PATH "
7280
7381 python -m pip install --upgrade pip
7482}
You can’t perform that action at this time.
0 commit comments