diff --git a/.travis.yml b/.travis.yml index bc647cb..58ccbc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ matrix: language: generic env: - _OSX=10.11 - - _PHP: php71 cache: directories: @@ -28,7 +27,6 @@ before_install: - if [[ $DISABLE_XDEBUG == "true" ]]; then phpenv config-rm xdebug.ini; fi install: - - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then /usr/bin/env bash bin/handle_brew_pkg.sh "${_PHP}" ; fi - curl -s http://getcomposer.org/installer | php - php composer.phar install --no-interaction --ignore-platform-reqs diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7b3aa..efd2174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This changelog references the relevant changes done in PHP-ML library. * enhancement Throw proper exception (#259, #251) * fix ensure DataTransformer::testSet samples array is not empty (#204) * fix optimizer initial theta randomization (#239) + * fix travis build on osx (#281) * typo, tests, code styles and documentation fixes (#265, #261, #254, #253, #251, #250, #248, #245, #243) * 0.6.2 (2018-02-22) diff --git a/bin/handle_brew_pkg.sh b/bin/handle_brew_pkg.sh deleted file mode 100644 index 3e501e0..0000000 --- a/bin/handle_brew_pkg.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -if [[ "$#" -eq 1 ]]; then - echo "Handling \"$1\" brew package..." -else - echo "Brew failed - invalid $0 call" - exit 1; -fi - -if [[ $(brew ls --versions "$1") ]]; then - if brew outdated "$1"; then - echo "Package upgrade is not required, skipping" - else - echo "Updating package..."; - brew upgrade "$1" - if [ $? -ne 0 ]; then - echo "Upgrade failed" - exit 1 - fi - fi -else - echo "Package not available - installing..." - brew install "$1" - if [ $? -ne 0 ]; then - echo "Install failed" - exit 1 - fi -fi - -echo "Linking installed package..." -brew link "$1" \ No newline at end of file diff --git a/bin/prepare_osx_env.sh b/bin/prepare_osx_env.sh index 93303ee..e185bd3 100644 --- a/bin/prepare_osx_env.sh +++ b/bin/prepare_osx_env.sh @@ -6,14 +6,6 @@ brew --version echo "Updating brew..." brew update - -if [[ "${_PHP}" == "hhvm" ]]; then - echo "Adding brew HHVM dependencies..." - brew tap hhvm/hhvm - -else - echo "Adding brew PHP dependencies..." - brew tap homebrew/dupes - brew tap homebrew/versions - brew tap homebrew/homebrew-php -fi \ No newline at end of file +brew install php@7.1 +brew upgrade php@7.1 +brew link php@7.1 --overwrite --force \ No newline at end of file