Skip to content

Commit 4a39d33

Browse files
committed
Next round on AppVeyor reliability.
1 parent f19dfac commit 4a39d33

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

appveyor/build.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@ if not exist "%SDK_RUNNER%" (
2929
exit /b 3
3030
)
3131

32-
call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat
32+
cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat
33+
if %errorlevel% neq 0 exit /b 3
34+
35+
exit /b 0
3336

appveyor/build_task.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ set STABILITY=staging
1919
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%
2020
rem SDK is cached, deps info is cached as well
2121
echo Updating dependencies in %DEPS_DIR%
22-
call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR%
22+
cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR%
2323
if %errorlevel% neq 0 exit /b 3
2424

25-
call buildconf.bat --force
25+
cmd /c buildconf.bat --force
2626
if %errorlevel% neq 0 exit /b 3
2727

2828
if "%THREAD_SAFE%" equ "0" set ADD_CONF=--disable-zts
2929

3030
set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap,dba
3131
if "%OPCACHE%" equ "0" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache
3232

33-
call configure.bat ^
33+
cmd /c configure.bat ^
3434
--enable-snapshot-build ^
3535
--disable-debug-pack ^
3636
--with-mcrypt=shared ^

appveyor/test.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ if not exist "%SDK_RUNNER%" (
66
exit /b 3
77
)
88

9-
call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat
9+
cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat
10+
if %errorlevel% neq 0 exit /b 3
1011

11-
exit /b %errorlevel%
12+
exit /b 0
1213

appveyor/test_task.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
1212
set STABILITY=staging
1313
)
1414
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%
15+
if not exist "%DEPS_DIR%" (
16+
echo "%DEPS_DIR%" doesn't exist
17+
exit /b 3
18+
)
1519

1620
rem setup MySQL related exts
1721
set MYSQL_PWD=Password12!
@@ -25,6 +29,7 @@ set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
2529
set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
2630
set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST% port=%PDO_MYSQL_TEST_PORT% dbname=test user=%PDO_MYSQL_TEST_USER% password=%MYSQL_PW%
2731
"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" --user=%MYSQL_TEST_USER% -e "CREATE DATABASE IF NOT EXISTS test"
32+
if %errorlevel% neq 0 exit /b 3
2833

2934
rem setup PostgreSQL related exts
3035
set PGUSER=postgres
@@ -33,12 +38,15 @@ rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres pa
3338
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
3439
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
3540
"C:\Program Files\PostgreSQL\9.5\bin\createdb.exe" test
41+
if %errorlevel% neq 0 exit /b 3
3642

3743
rem prepare for ext/openssl
3844
if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL
3945
if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL
4046
mkdir c:\usr\local\ssl
47+
if %errorlevel% neq 0 exit /b 3
4148
copy %DEPS_DIR%\template\ssl\openssl.cnf c:\usr\local\ssl
49+
if %errorlevel% neq 0 exit /b 3
4250
set OPENSSL_CONF=c:\usr\local\ssl\openssl.cnf
4351
rem set OPENSSL_CONF=
4452
rem set SSLEAY_CONF=
@@ -48,9 +56,13 @@ if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enabled=1 -d opcache.enable_c
4856

4957
rem prepare for enchant
5058
mkdir c:\enchant_plugins
59+
if %errorlevel% neq 0 exit /b 3
5160
copy %DEPS_DIR%\bin\libenchant_ispell.dll c:\enchant_plugins
61+
if %errorlevel% neq 0 exit /b 3
5262
copy %DEPS_DIR%\bin\libenchant_myspell.dll c:\enchant_plugins
63+
if %errorlevel% neq 0 exit /b 3
5364
reg add HKEY_CURRENT_USER\SOFTWARE\Enchant\Config /v Module_Dir /t REG_SZ /d c:\enchant_plugins
65+
if %errorlevel% neq 0 exit /b 3
5466
set PHP_BUILD_CACHE_ENCHANT_DICT_DIR=%PHP_BUILD_CACHE_BASE_DIR%\enchant_dict
5567
if not exist "%PHP_BUILD_CACHE_ENCHANT_DICT_DIR%" (
5668
echo Creating %PHP_BUILD_CACHE_ENCHANT_DICT_DIR%

0 commit comments

Comments
 (0)