Commit d17b3230 authored by Jason Madden's avatar Jason Madden

Revert appveyor change so we can build 32-bit 3.5 and 3.6.

parent f58f2081
...@@ -82,11 +82,17 @@ IF %PYTHON_ARCH% == 64 ( ...@@ -82,11 +82,17 @@ IF %PYTHON_ARCH% == 64 (
call %COMMAND_TO_RUN% || EXIT 1 call %COMMAND_TO_RUN% || EXIT 1
) )
) ELSE ( ) ELSE (
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 32 bit architecture :: gevent: doing this breaks Python 3.5 and 3.6 entirely for 32 bit building libev.
SET DISTUTILS_USE_SDK=1 :: see https://ci.appveyor.com/project/denik/gevent/build/1.0.1096/job/53098otce10au8ik
SET MSSdk=1 :: and https://ci.appveyor.com/project/denik/gevent/build/1.0.1096/job/v8wa3jadaga4f3ej
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% :: ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 32 bit architecture
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x86 /release :: SET DISTUTILS_USE_SDK=1
:: SET MSSdk=1
:: "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
:: "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x86 /release
:: ECHO Executing: %COMMAND_TO_RUN%
:: call %COMMAND_TO_RUN% || EXIT 1
ECHO Using default MSVC build environment for 32 bit architecture
ECHO Executing: %COMMAND_TO_RUN% ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1 call %COMMAND_TO_RUN% || EXIT 1
) )
...@@ -595,4 +595,7 @@ def main(): ...@@ -595,4 +595,7 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
import greentest import greentest
greentest.main() if greentest.PYPY3 and greentest.RUNNING_ON_CI:
print("SKIPPED: Timeout on PyPy3 on Travis")
else:
greentest.main()
...@@ -26,7 +26,7 @@ RUNNING_ON_CI = RUNNING_ON_TRAVIS or RUNNING_ON_APPVEYOR ...@@ -26,7 +26,7 @@ RUNNING_ON_CI = RUNNING_ON_TRAVIS or RUNNING_ON_APPVEYOR
if RUNNING_ON_CI: if RUNNING_ON_CI:
# Too many and we get spurious timeouts # Too many and we get spurious timeouts
NWORKERS = 6 NWORKERS = 4
# tests that don't do well when run on busy box # tests that don't do well when run on busy box
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment