Skip to content

Commit

Permalink
DevKit updates (#166)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Aug 8, 2017
2 parents 829a8fc + 074e56d commit 7e6adc5
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 17 deletions.
12 changes: 5 additions & 7 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,19 @@

#### Sonata packages

```bash
$ composer show sonata-project/*
# Put the result here.
```
$ composer show --latest 'sonata-project/*'
```

#### Symfony packages

```bash
$ composer show symfony/*
# Put the result here.
```
$ composer show --latest 'symfony/*'
```

#### PHP version

```bash
```
$ php -v
# Put the result here.
```
Expand Down
2 changes: 2 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ finder:
- 'Tests/Fixtures'
# ecommerce special case:
- 'Resources/skeleton'
# ignore vendor assets
- 'Resources/public/vendor'
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ php:
- '7.0'
- '7.1'
- nightly
- hhvm

sudo: false

Expand Down Expand Up @@ -55,14 +54,14 @@ matrix:
env: SYMFONY=3.2.*
- php: '7.1'
env: SYMFONY=dev-master@dev
- php: '7.1'
env: SONATA_USER=2.*
- php: '7.1'
env: SONATA_USER=3.*
- php: '7.1'
env: SONATA_USER=dev-master@dev
- php: '7.1'
env: SYMFONY_DEPRECATIONS_HELPER=0
- php: hhvm
dist: trusty
allow_failures:
- php: nightly
- php: hhvm
Expand Down
2 changes: 0 additions & 2 deletions .travis/before_install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then

fi

# To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
composer self-update --stable
sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json

if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
Expand Down
4 changes: 0 additions & 4 deletions .travis/before_script_test.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
#!/usr/bin/env sh
set -ev

if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
mv /tmp/xdebug.ini "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d"
fi
2 changes: 1 addition & 1 deletion .travis/install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ chmod u+x "${HOME}/bin/coveralls"
# https://github.com/composer/composer/issues/5030
composer update --prefer-dist --no-interaction --prefer-stable --quiet --ignore-platform-reqs

travis_wait composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

0 comments on commit 7e6adc5

Please sign in to comment.