diff options
author | Anatol Belski <ab@php.net> | 2016-12-17 11:27:17 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2016-12-17 11:27:17 +0100 |
commit | a3a8cc686a23453ee8f04363cceb34b3b8d9a451 (patch) | |
tree | 6b80390d8f2e83f72f0d682b856034cc6dde6c5b /appveyor | |
parent | c104f09d88030a44fb2ee12ea7c82d33b7763dcf (diff) | |
parent | 9afb05dcd10154177366b1612ab35bcfc8410db9 (diff) | |
download | php-git-a3a8cc686a23453ee8f04363cceb34b3b8d9a451.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add Appveyor fast_fail
improve error check
Diffstat (limited to 'appveyor')
-rw-r--r-- | appveyor/build_task.bat | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index 52f049f744..cf5187738c 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -1,14 +1,14 @@ @echo off if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw >NUL 2>NUL -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw-w64 >NUL 2>NUL -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 cd /D %APPVEYOR_BUILD_FOLDER% -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" ( set BRANCH=%APPVEYOR_REPO_BRANCH:~4% @@ -21,9 +21,10 @@ set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%APPVEY rem SDK is cached, deps info is cached as well echo Updating dependencies call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% +if %errorlevel% neq 0 exit /b 3 call buildconf.bat --force -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 if "%THREAD_SAFE%" equ "0" set ADD_CONF=--disable-zts @@ -40,10 +41,10 @@ call configure.bat ^ --with-php-build=%DEPS_DIR% ^ %ADD_CONF% ^ --with-test-ini-ext-exclude=%EXT_EXCLUDE_FROM_TEST% -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 nmake /NOLOGO -if errorlevel 1 exit /b 1 +if %errorlevel% neq 0 exit /b 3 exit /b 0 |