Skip to content

Commit

Permalink
Merge pull request #57 from ikari7789/bugfix/fix-tests
Browse files Browse the repository at this point in the history
Install initial packages via TravisCI
  • Loading branch information
philcook authored Jan 9, 2019
2 parents 99532fc + df9945b commit 8180615
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 24 deletions.
12 changes: 9 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
language: bash
os: osx
osx_image: xcode7.3
osx_image: xcode9.4

install:
- ./.travis/install.sh
addons:
homebrew:
packages:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
update: true

script:
- ./.travis/clean.sh
Expand Down
2 changes: 1 addition & 1 deletion .travis/clean.sh
Original file line number Diff line number Diff line change
@@ -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
19 changes: 0 additions & 19 deletions .travis/install.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .travis/test.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 8180615

Please sign in to comment.