diff --git a/.travis.yml b/.travis.yml index c90c983..d4db537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,15 @@ language: bash os: osx -osx_image: xcode7.3 +osx_image: xcode9.4 -install: - - ./.travis/install.sh +addons: + homebrew: + packages: + - php@5.6 + - php@7.1 + - php@7.2 + - php@7.3 + update: true script: - ./.travis/clean.sh diff --git a/.travis/clean.sh b/.travis/clean.sh index a0d9837..6f0a4eb 100755 --- a/.travis/clean.sh +++ b/.travis/clean.sh @@ -1,5 +1,5 @@ #!/bin/bash -for version in '5.6' '7.0' '7.1' '7.2'; do +for version in '5.6' '7.1' '7.2' '7.3'; do brew unlink php@$version done diff --git a/.travis/install.sh b/.travis/install.sh deleted file mode 100755 index a8c7307..0000000 --- a/.travis/install.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - brew tap homebrew/dupes - brew update - brew install php@5.6 - brew unlink php@5.6 - brew install php@7.0 - brew unlink php@7.0 - brew install php@7.1 - brew unlink php@7.1 - brew install php@7.2 - brew unlink php@7.2 - brew install php@7.3 - brew link --overwrite php@7.3 - brew unlink php@7.3 - - echo 'Installed all PHP versions.' -fi diff --git a/.travis/test.sh b/.travis/test.sh index 3214603..839f295 100755 --- a/.travis/test.sh +++ b/.travis/test.sh @@ -1,7 +1,7 @@ #!/bin/bash error=0 -for version in '5.6' '7.0' '7.1' '7.2' '7.3'; do +for version in '5.6' '7.1' '7.2' '7.3'; do . `echo $(dirname $0)"/../phpswitch.sh"` $version -s > /dev/null switched=$(php -v | grep -e '^PHP' | cut -d' ' -f2 | cut -d. -f1,2) if [ "$version" != "$switched" ]; then