File tree Expand file tree Collapse file tree 2 files changed +2
-22
lines changed Expand file tree Collapse file tree 2 files changed +2
-22
lines changed Original file line number Diff line number Diff line change @@ -11,32 +11,14 @@ jobs:
1111 steps :
1212 - checkout
1313
14- - run :
15- name : Prepare dependency folders
16- command : mkdir -p ~/.m2 ~/.ivy2 ~/.sbt
17-
18- - restore_cache :
19- key : cache-{{ .Branch }}
20-
21- - run :
22- name : debug git output
23- command : docker-compose run -T -e CI=$CI sbt bash -c "git config --global --add safe.directory /fossildb && git rev-parse HEAD"
24-
2514 - run :
2615 name : Build server
27- command : docker-compose run -T -e CI=$CI sbt bash -c "git config --global --add safe.directory /fossildb && sbt assembly"
16+ command : docker-compose run -T -e CI=$CI sbt sbt assembly
2817
2918 - run :
3019 name : Get FossilDB version
3120 command : docker-compose run -T sbt java -jar $TARGET_DIR/fossildb.jar --version > $TARGET_DIR/version
3221
33- - save_cache :
34- key : cache-{{ .Branch }}
35- paths :
36- - " ~/.m2"
37- - " ~/.ivy2"
38- - " ~/.sbt"
39-
4022 - run :
4123 name : Build server docker image
4224 command : |
Original file line number Diff line number Diff line change @@ -36,8 +36,6 @@ services:
3636 - USER_GID
3737 - TZ
3838 working_dir : /fossildb
39+ user : ${USER_UID:1000}:${USER_GID:1000}
3940 volumes :
4041 - " .:/fossildb"
41- - " ~/.m2:/home/sbt-user/.m2"
42- - " ~/.ivy2:/home/sbt-user/.ivy2"
43- - " ~/.sbt:/home/sbt-user/.sbt"
You can’t perform that action at this time.
0 commit comments