Skip to content

Commit

Permalink
Reverting parts of travis config.
Browse files Browse the repository at this point in the history
  • Loading branch information
zobo committed Nov 22, 2019
1 parent 3888c3c commit 8e81d9c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
- NPM_VERSION=^6.3.0
- BUILD_LEADER_ID=4
matrix:
- XDEBUG_VERSION=2.5.5
- XDEBUG_VERSION=2.7.2

sudo: false

Expand All @@ -18,7 +18,12 @@ cache:
- $HOME/.npm

before_install:
- ./scripts/travis-beforeinstall.sh 'main'
- pecl channel-update pecl.php.net
- pecl install xdebug-${XDEBUG_VERSION} || true
- phpenv config-add travis-php.ini
- nvm install ${NODE_VERSION}
- nvm use ${NODE_VERSION}
- npm install -g npm@${NPM_VERSION} --depth 0

install:
- npm ci
Expand All @@ -35,11 +40,6 @@ after_success:
jobs:
include:
- stage: test
os: osx
osx_image: xcode10.2
language: generic
before_install:
- ./scripts/travis-beforeinstall.sh 'test'
- stage: release
language: node_js
node_js: '8'
Expand Down
5 changes: 4 additions & 1 deletion scripts/travis-beforeinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ beforeInstall::test() {
TRAVIS_INI="${dirConfd}/travis-php.ini"
# see per https://javorszky.co.uk/2018/05/03/getting-xdebug-working-on-php-7-2-and-homebrew/
# avoid problems with brew's symlink and pecl's recursive mkdir
rm "${dirCellar}"
find -L ${dirCellar}
rm -rf "${dirCellar}"
pecl install "xdebug-${XDEBUG_VERSION}"
# make xdebug.so available at pecl's expected location
ln -s "${dirCellar}" '/usr/local/lib/php/pecl'
find -L /usr/local/lib/php/
find ${dirCellar}
php --ini
php --version
whereis php
Expand Down

0 comments on commit 8e81d9c

Please sign in to comment.