8000 minor #18276 [ci] Tweak scripts (nicolas-grekas) · symfony/symfony@a5965fb · GitHub
[go: up one dir, main page]
Skip to content

Commit a5965fb

Browse files
nicolas-grekasnicolas-grekas
committed
minor #18276 [ci] Tweak scripts (nicolas-grekas)
This PR was merged into the 2.3 branch. Discussion ---------- [ci] Tweak scripts | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | sebastianbergmann/phpunit-mock-objects#299 | License | MIT | Doc PR | - Commits ------- 82c6bed [ci] Tweak scripts
2 parents 483da73 + 82c6bed commit a5965fb

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

‎appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ install:
3838
- IF %PHP%==1 echo max_execution_time=1200 >> php.ini-min
3939
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min
4040
- IF %PHP%==1 echo extension_dir=ext >> php.ini-min
41-
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min
42-
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-min
43-
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-min
4441
- IF %PHP%==1 copy /Y php.ini-min php.ini-max
42+
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-max
4543
- IF %PHP%==1 echo extension=php_apcu.dll >> php.ini-max
4644
- IF %PHP%==1 echo apc.enable_cli=1 >> php.ini-max
4745
- IF %PHP%==1 echo extension=php_memcache.dll >> php.ini-max
4846
- IF %PHP%==1 echo extension=php_intl.dll >> php.ini-max
4947
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini-max
5048
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini-max
5149
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
50+
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
51+
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
5252
- appveyor DownloadFile https://getcomposer.org/composer.phar
5353
- copy /Y php.ini-max php.ini
5454
- cd c:\projects\symfony

‎phpunit

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
// Please update when phpunit needs to be reinstalled with fresh deps:
14-
// Cache-Id-Version: 2016-03-22 17:23 UTC
14+
// Cache-Id-Version: 2016-03-23 14:50 UTC
1515

1616
use Symfony\Component\Process\ProcessUtils;
1717

@@ -53,7 +53,10 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
5353
chdir("phpunit-$PHPUNIT_VERSION");
5454
passthru("$COMPOSER remove --no-update symfony/yaml");
5555
passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.1@dev\"");
56-
passthru("$COMPOSER install --prefer-dist --no-progress --ansi");
56+
passthru("$COMPOSER install --prefer-dist --no-progress --ansi", $exit);
57+
if ($exit) {
58+
exit($exit);
59+
}
5760
file_put_contents('phpunit', <<<'EOPHP'
5861
<?php
5962

0 commit comments

Comments
 (0)
0