H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update travis configuration

Browse Source
This commit is contained in:
Vincent Letourneau
2017-07-29 14:50:21 +02:00
parent 6710f9cc83
commit d69bf3a084
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -1,4 +1,4 @@
sudo: required #sudo: required
env: env:
DOCKER_COMPOSE_VERSION: 1.14.0 DOCKER_COMPOSE_VERSION: 1.14.0
@@ -16,7 +16,7 @@ before_install:
before_script: before_script:
- make docker-start - make docker-start
- sleep 2m - sleep 3m
- docker inspect -f {{.Config.Volumes}} $(docker-compose ps -q php) - docker inspect -f {{.Config.Volumes}} $(docker-compose ps -q php)
script: script:

7
Makefile
View File

@@ -27,8 +27,11 @@ help:
init: init:
@$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null) @$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null)
travis:
@docker exec $(shell docker-compose ps -q php) php -r 'echo getcwd(); var_dump(file_exists("app/vendor/apigen/apigen/bin/apigen"));'
apidoc: apidoc:
@docker exec $(shell docker-compose ps -q php) sh -c 'exec app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc' @docker exec $(shell docker-compose ps -q php) app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
@make resetOwner @make resetOwner
clean: clean:
@@ -68,7 +71,7 @@ mysql-restore:
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql @docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql
test: test:
@docker exec -i $(shell docker-compose ps -q php) php app/vendor/bin/phpunit --colors=always --configuration app/ @docker exec -i $(shell docker-compose ps -q php) app/vendor/bin/phpunit --colors=always --configuration app/
@make resetOwner @make resetOwner
resetOwner: resetOwner: