Skip to content

Commit

Permalink
Fix Windows 32bit releasing
Browse files Browse the repository at this point in the history
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 <aiudirog@gmail.com>

[rharwood@redhat.com: fix exit handling in build.sh, commit style cleanup]
  • Loading branch information
aiudirog authored and frozencemetery committed Jun 30, 2021
1 parent baeedbe commit 4730eb1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
11 changes: 4 additions & 7 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,10 @@ if [ $BUILD_RES -ne 0 ]; then
exit $BUILD_RES
fi

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

python setup.py nosetests --verbosity=3
TEST_RES=$?

exit $TEST_RES
9 changes: 1 addition & 8 deletions ci/release-win.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
#!/bin/bash -e

source ./ci/lib-setup.sh
source ./ci/lib-deploy.sh

./ci/build.sh

# Sigh, go find paths again
export PATH="/c/Program Files/MIT/Kerberos/bin:"\
"/c/Program Files (x86)/MIT/Kerberos/bin:$PATH"
source ./ci/build.sh

# build the wheel
python -m pip install wheel
Expand Down

0 comments on commit 4730eb1

Please sign in to comment.