10000 [travis] Fix tests cancellations · symfony/symfony@4e27187 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4e27187

Browse files
nicolas-grekasnicolas-grekas
committed
[travis] Fix tests cancellations
1 parent 9215c22 commit 4e27187

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

‎.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ env:
2626
- SYMFONY_DEPRECATIONS_HELPER=weak
2727

2828
before_install:
29-
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then git fetch origin "refs/pull/$TRAVIS_PULL_REQUEST/merge"; else git fetch origin "$TRAVIS_BRANCH"; fi;
30-
- if [[ "$TRAVIS_COMMIT" != `git rev-parse FETCH_HEAD` ]]; then echo "Pull request or branch commit hash has changed, aborting!"; exit 1; fi;
29+
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then git fetch origin "refs/pull/$TRAVIS_PULL_REQUEST/head"; else git fetch origin "$TRAVIS_BRANCH"; fi;
30+
- if [[ `git merge-base FETCH_HEAD HEAD` != `git rev-parse FETCH_HEAD` ]]; then echo "Pull request or branch commit hash has changed, aborting!"; exit 1; fi;
3131
- travis_retry sudo apt-get install parallel
3232
- composer self-update
3333
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then phpenv config-rm xdebug.ini; fi;
3434
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
3535
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
36-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then pecl install -f memcached-2.1.0; fi;
37-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
36+
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then (pecl install -f memcached-2.1.0 && echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) || echo 'Failed to install memcache extension'; fi;
3837
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then php -i; fi;
3938
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
4039
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built

0 commit comments

Comments
 (0)
0