Skip to content

Commit 4730eb1

Browse files
aiudirogfrozencemetery
authored andcommitted
Fix Windows 32bit releasing
Sourcing build.sh instead of executing it keeps the PATH changes around so the proper version of MIT Kerberos is automatically selected. Signed-off-by: Roger Aiudi <[email protected]> [[email protected]: fix exit handling in build.sh, commit style cleanup]
1 parent baeedbe commit 4730eb1

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

ci/build.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ if [ $BUILD_RES -ne 0 ]; then
3535
exit $BUILD_RES
3636
fi
3737

38+
# Only call exit on failures so we can source this script
3839
if [ x"$KRB5_VER" = "xheimdal" ] || [ "$OS_NAME" = "windows" ]; then
3940
# heimdal/Windows can't run the tests yet, so just make sure it imports and exit
40-
python -c "import gssapi"
41-
exit $?
41+
python -c "import gssapi" || exit $?
42+
else
43+
python setup.py nosetests --verbosity=3 || exit $?
4244
fi
43-
44-
python setup.py nosetests --verbosity=3
45-
TEST_RES=$?
46-
47-
exit $TEST_RES

ci/release-win.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
#!/bin/bash -e
22

3-
source ./ci/lib-setup.sh
4-
source ./ci/lib-deploy.sh
5-
6-
./ci/build.sh
7-
8-
# Sigh, go find paths again
9-
export PATH="/c/Program Files/MIT/Kerberos/bin:"\
10-
"/c/Program Files (x86)/MIT/Kerberos/bin:$PATH"
3+
source ./ci/build.sh
114

125
# build the wheel
136
python -m pip install wheel

0 commit comments

Comments
 (0)