Skip to content

Commit 46b6c42

Browse files
author
David Baum
committed
Merge branch 'feature/fix_ci' into development
2 parents bbdd362 + e723dff commit 46b6c42

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ matrix:
1111
language: java
1212
before_install:
1313
- cd generator2
14-
- cd org.getaviz.parent/
14+
- cd org.getaviz.generator/
1515
script:
16-
- mvn clean install -fae
16+
- mvn clean install
1717
- name: Evaluation Server
1818
language: ruby
1919
before_script:

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
version: "3"
22
services:
3-
#db:
3+
db:
44
#image: mysql:5.7
55
#environment:
66
#MYSQL_ROOT_PASSWORD: dbpassword_for_user
77
#MYSQL_DATABASE: eval_server_development
88
#MYSQL_USER: db_username
99
#MYSQL_PASSWORD: dbpassword_for_user
1010
#restart: always
11-
#eval:
11+
eval:
1212
#build: evaluationserver
1313
#env_file: evaluationserver/env
1414
#command: "./bin/wait-for-it.sh db:3306 -s -t 30 -- ./bin/docker_start"
@@ -35,6 +35,6 @@ services:
3535
- ./generator2/databases:/opt/databases/
3636
ports:
3737
- "8083:8080"
38-
#volumes:
39-
#bundle:
40-
#driver: local
38+
volumes:
39+
bundle:
40+
driver: local

0 commit comments

Comments
 (0)