Run travis build using make commands and include setup/build pre test

jamesrwhite · Sep 11, 2017 · ec8f58b · ec8f58b
1 parent e7fd671
commit ec8f58b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -5,4 +5,6 @@ echo "TODO: add client build"
 
 # Server build
 cd server
-bundle exec rspec
+make setup
+make build
+make test
diff --git a/server/Makefile b/server/Makefile
@@ -1,7 +1,7 @@
 .PHONY: build
 
-deps:
-	gem install bundler
+setup:
+	gem install --version 1.15.4 bundler
 
 build_assets:
 	RACK_ENV=production rake assets:precompile