Skip to content

Commit

Permalink
Merge pull request #401 from sonata-project/3.x-dev-kit
Browse files Browse the repository at this point in the history
DevKit updates for 3.x branch
  • Loading branch information
greg0ire committed Sep 20, 2017
2 parents 052f1eb + 0b79795 commit b7b5e57
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ matrix:
env: SYMFONY=2.7.*
- php: '7.1'
env: SYMFONY=2.8.*
- php: '7.1'
env: SYMFONY=3.1.*
- php: '7.1'
env: SYMFONY=3.2.*
- php: '7.1'
env: SYMFONY=3.3.*
- php: '7.1'
env: SYMFONY=dev-master@dev
- php: '7.1'
Expand Down
7 changes: 7 additions & 0 deletions .travis/before_install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"

if [ "$TRAVIS_PHP_VERSION" '<' '5.4' ]; then
XDEBUG_INI_FILE="$PHP_INI_DIR/xdebug.ini"
if [ -f "$XDEBUG_INI_FILE" ]; then
mv "$XDEBUG_INI_FILE" /tmp
fi
fi

fi

sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
Expand Down
10 changes: 9 additions & 1 deletion .travis/before_script_test.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
#!/usr/bin/env sh
#!/usr/bin/env bash
set -ev

if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" '<' '5.4' ]; then
PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
XDEBUG_INI_FILE="/tmp/xdebug.ini"
if [ -f "$XDEBUG_INI_FILE" ]; then
mv "$XDEBUG_INI_FILE" "$PHP_INI_DIR"
fi
fi

0 comments on commit b7b5e57

Please sign in to comment.