8000 minor #14141 [travis] Revert tests cancellations and don't fail if me… · symfony/symfony@85c9781 · GitHub
[go: up one dir, main page]
Skip to content

Commit 85c9781

Browse files
nicolas-grekasnicolas-grekas
committed
minor #14141 [travis] Revert tests cancellations and don't fail if memcached is not avail (nicolas-grekas)
This PR was merged into the 2.3 branch. Discussion ---------- [travis] Revert tests cancellations and don't fail if memcached is not avail | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - I don't understand how travis gets its $TRAVIS_COMMIT, but this should make things stable again. Commits ------- 7441955 [travis] Fix tests cancellations
2 parents 9215c22 + 7441955 commit 85c9781

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

‎.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@ 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;
3129
- travis_retry sudo apt-get install parallel
3230
- composer self-update
3331
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then phpenv config-rm xdebug.ini; fi;
3432
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
3533
- 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;
34+
- 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 "Let's continue without memcache extension"; fi;
3835
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then php -i; fi;
3936
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
4037
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built

0 commit comments

Comments
 (0)
0