Skip to content

Commit

Permalink
Merge pull request #85 from Nyholm/flex2
Browse files Browse the repository at this point in the history
Make sure tests on different sf versions are wokring
  • Loading branch information
HypeMC authored Jul 6, 2019
2 parents 599562c + a8c939d commit 8cac928
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ install:
- dev/bin/docker-compose build --build-arg PHP_VERSION=${PHP_VERSION} php

before_script:
- dev/bin/php composer require symfony/flex --ansi --no-update
# Our docker image has symfony/flex installed to make sure SYMFONY_VERSION is working
- dev/bin/php composer config extra.symfony.require "${SYMFONY_VERSION}"
- dev/bin/php composer install --ansi --prefer-dist --no-scripts
- dev/bin/php composer update --ansi --prefer-dist

script:
- dev/bin/php composer test -- --colors=always --coverage-clover=coverage.xml --debug
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN curl --show-error https://getcomposer.org/installer | php -- \
RUN useradd -ms /bin/sh app

# Enable parallel package installation for Composer
RUN su-exec app composer global require hirak/prestissimo
RUN su-exec app composer global require symfony/flex

COPY entrypoint.sh /usr/local/bin/docker-entrypoint

Expand Down

0 comments on commit 8cac928

Please sign in to comment.