From 6710f9cc83f419d23398b5fddbd27febe0dc6601 Mon Sep 17 00:00:00 2001 From: Vincent Letourneau Date: Sat, 29 Jul 2017 14:16:49 +0200 Subject: [PATCH] Update travis configuration --- .travis.yml | 7 ++----- Makefile | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index edc135d..0234e6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,9 @@ before_install: - docker-compose --version before_script: - - echo $(pwd) - make docker-start - - sleep 3m + - sleep 2m - docker inspect -f {{.Config.Volumes}} $(docker-compose ps -q php) - - ls -lah script: - - make apidoc - - make test \ No newline at end of file + - make apidoc \ No newline at end of file diff --git a/Makefile b/Makefile index 8826718..112a704 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ init: @$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null) apidoc: - @docker exec -i $(shell docker-compose ps -q php) app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc + @docker exec $(shell docker-compose ps -q php) sh -c 'exec app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc' @make resetOwner clean: