Update travis configuration

This commit is contained in:
Vincent Letourneau
2017-07-29 16:03:42 +02:00
parent 5c04235514
commit 6bbbb5bce2
2 changed files with 4 additions and 4 deletions

View File

@@ -16,12 +16,12 @@ before_install:
before_script: before_script:
- make docker-start - make docker-start
- sleep 30s - sleep 1m && sleep 30s
script: script:
- make gen-certs
- make apidoc - make apidoc
- make test - make test
- make gen-certs
- make mysql-dump - make mysql-dump
before_script: before_script:

View File

@@ -61,11 +61,11 @@ logs:
mysql-dump: mysql-dump:
@mkdir -p $(MYSQL_DUMPS_DIR) @mkdir -p $(MYSQL_DUMPS_DIR)
@docker exec -i $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql @docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql
@make resetOwner @make resetOwner
mysql-restore: mysql-restore:
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql @docker exec -i $(shell docker-compose ps -q mysqldb) 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) 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/