Skip to content

Commit

Permalink
Remove hhvm support from readme/travis config & scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
andyjack committed Feb 19, 2019
1 parent 7a255b2 commit 4d0529d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 33 deletions.
21 changes: 9 additions & 12 deletions .travis-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
set -e
set -x

if [ "hhvm" != $TRAVIS_PHP_VERSION ]
then
export CFLAGS="-L$HOME/libmaxminddb/lib"
export CPPFLAGS="-I$HOME/libmaxminddb/include"
cd ext
phpize
./configure --with-maxminddb --enable-maxminddb-debug
make clean
make
NO_INTERACTION=1 make test
cd ..
fi
export CFLAGS="-L$HOME/libmaxminddb/lib"
export CPPFLAGS="-I$HOME/libmaxminddb/include"
cd ext
phpize
./configure --with-maxminddb --enable-maxminddb-debug
make clean
make
NO_INTERACTION=1 make test
cd ..
17 changes: 7 additions & 10 deletions .travis-install-prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ set -x
git submodule update --init --recursive
composer self-update
composer install --dev -n --prefer-source
if [ "hhvm" != "$TRAVIS_PHP_VERSION" ]
then
mkdir -p "$HOME/libmaxminddb"
git clone --recursive git://github.com/maxmind/libmaxminddb
cd libmaxminddb
./bootstrap
./configure --prefix="$HOME/libmaxminddb"
make
make install
fi
mkdir -p "$HOME/libmaxminddb"
git clone --recursive git://github.com/maxmind/libmaxminddb
cd libmaxminddb
./bootstrap
./configure --prefix="$HOME/libmaxminddb"
make
make install
13 changes: 5 additions & 8 deletions .travis-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ set -x
mkdir -p build/logs
./vendor/bin/phpunit -c .coveralls-phpunit.xml.dist

if [ "hhvm" != "$TRAVIS_PHP_VERSION" ]
then
echo "mbstring.internal_encoding=utf-8" >> ~/.phpenv/versions/"$(phpenv version-name)"/etc/php.ini
echo "mbstring.func_overload = 7" >> ~/.phpenv/versions/"$(phpenv version-name)"/etc/php.ini
./vendor/bin/phpunit
echo "mbstring.internal_encoding=utf-8" >> ~/.phpenv/versions/"$(phpenv version-name)"/etc/php.ini
echo "mbstring.func_overload = 7" >> ~/.phpenv/versions/"$(phpenv version-name)"/etc/php.ini
./vendor/bin/phpunit

echo "extension = ext/modules/maxminddb.so" >> ~/.phpenv/versions/"$(phpenv version-name)"/etc/php.ini
./vendor/bin/phpunit
fi
echo "extension = ext/modules/maxminddb.so" >> ~/.phpenv/versions/"$(phpenv version-name)"/etc/php.ini
./vendor/bin/phpunit

if [ $RUN_LINTER ]; then
vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --config=.php_cs
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ matrix:
env:
- RUN_LINTER=1
- RUN_SNYK=1
- php: hhvm
env:
global:
- secure: "RMIBN2tNKlrGA07coRW4B9m9jCobrYxDkEq3T3jGoGtXgQe/Mr3bI/4zQo7U3bvVTSF90lzkWbxATY45GQXRxWC7Ed2HI2jwUF96CXecdRhKiE9x051HsvXakvbODPLocV7/2LOZqz+eXCUeazLgRaSrIhAqMddFqMQSSM5STlc="
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ client API, please see [our support page](http://www.maxmind.com/en/support).

## Requirements ##

This library requires PHP 5.4 or greater. The pure PHP reader included is
compatible with HHVM.
This library requires PHP 5.4 or greater.

The GMP or BCMath extension may be required to read some databases
using the pure PHP API.
Expand Down

0 comments on commit 4d0529d

Please sign in to comment.