Skip to content

Commit b0e887f

Browse files
atymicjbelien
authored andcommitted
chore: fix ci geoip conflicts (#985)
1 parent 834b4ba commit b0e887f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ before_install:
4242
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi --prefer-dist'
4343
4444
# 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"'
4647
4748
# tfold is a helper to create folded reports
4849
tfold () {
@@ -71,9 +72,9 @@ install:
7172
if [[ $skip ]]; then
7273
echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
7374
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'"
7576
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'"
7778
else
7879
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
7980
tfold tty-group $PHPUNIT --group tty

0 commit comments

Comments
 (0)