File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -42,7 +42,8 @@ before_install:
42
42
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi --prefer-dist'
43
43
44
44
# If "geoip-1.1.1" exits in a provider's .travis.yml, then install the dependency.
45
- export GEOIP_EXT='(grep -Fq "geoip-1.1.1" .travis.yml && sleep 30 && pecl install geoip-1.1.1 && echo "Installed php-geoip") || echo "Did not install php-geoip"'
45
+ export GEOIP_EXT_INSTALL='(grep -Fq "geoip-1.1.1" .travis.yml && sleep 30 && pecl install geoip-1.1.1 && echo "Installed php-geoip") || echo "Did not install php-geoip"'
46
+ export GEOIP_EXT_REMOVE='(grep -Fq "geoip-1.1.1" .travis.yml && sleep 30 && pecl uninstall geoip-1.1.1 && echo "Removed php-geoip") || echo "php-geoip not installed"'
46
47
47
48
# tfold is a helper to create folded reports
48
49
tfold () {
@@ -71,9 +72,9 @@ install:
71
72
if [[ $skip ]]; then
72
73
echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
73
74
elif [[ $deps = high ]]; then
74
- echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $GEOIP_EXT && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
75
+ echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $GEOIP_EXT_INSTALL && $COMPOSER_UP && $PHPUNIT_X$LEGACY && $GEOIP_EXT_REMOVE '"
75
76
elif [[ $deps = low ]]; then
76
- echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $GEOIP_EXT && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'"
77
+ echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $GEOIP_EXT_INSTALL && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X && $GEOIP_EXT_REMOVE '"
77
78
else
78
79
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
79
80
tfold tty-group $PHPUNIT --group tty
You can’t perform that action at this time.
0 commit comments