Skip to content

Commit

Permalink
Properly handle phpunit on travis for 5.6
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
  • Loading branch information
tcitworld committed Aug 6, 2018
1 parent b2dfcc6 commit f7d2d87
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ before_install:
# we spawn in /home/travis/build/nextcloud/calendar
# go to /home/travis/build/
- cd ../../
- wget https://phar.phpunit.de/phpunit-5.7.phar
- chmod +x phpunit-5.7.phar
- mkdir bin
- sudo mv phpunit-5.7.phar bin/phpunit
- export PATH="$PWD/bin:$PATH"
- phpunit --version
# get a newer node.js version
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
Expand Down Expand Up @@ -82,6 +88,7 @@ before_script:

script:
- make
- make composer || true
- make test
- make dist
# Upload nightly
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ all: build
# is present, the npm step is skipped
.PHONY: build
build:
make composer
make yarn

# Installs and updates the composer dependencies. If composer is not installed
Expand All @@ -100,7 +99,7 @@ ifeq (, $(shell which composer 2> /dev/null))
curl -sS https://getcomposer.org/installer | php
mv composer.phar $(build_tools_directory)
endif
$(composer) install --prefer-dist --no-dev
$(composer) install --prefer-dist

# Installs yarn dependencies
.PHONY: yarn
Expand Down Expand Up @@ -176,6 +175,6 @@ endif
# from the internet
.PHONY: test
test:
$(composer) update --prefer-dist
make composer
cd js && $(yarn) run test && cd ../
./vendor/bin/phpunit -c phpunit.xml --coverage-clover coverage.clover
export PATH="$$PWD/vendor/bin:$$PATH" && phpunit -c phpunit.xml --coverage-clover coverage.clover

0 comments on commit f7d2d87

Please sign in to comment.