diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-01 08:44:29 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-01 08:44:29 -0500 |
| commit | 6e542efb8b3c0eea08129d78d610a667ac3d105e (patch) | |
| tree | 92e9e38ded2140be30f74106d7ff8357dd9845ca | |
| parent | b717a8100c3f2049fb94040ad8db11f56c0d9f13 (diff) | |
| parent | d31fc5ee10965d9c45e0e0f755607f6a46a9ba6d (diff) | |
| download | chat-6e542efb8b3c0eea08129d78d610a667ac3d105e.tar.gz chat-6e542efb8b3c0eea08129d78d610a667ac3d105e.tar.bz2 chat-6e542efb8b3c0eea08129d78d610a667ac3d105e.zip | |
Merge pull request #1532 from hmhealey/prepare
Added .prepare step to make test
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 20 |
2 files changed, 14 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 50cdca100..6e433df3c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ web/static/js/libs*.js # Build Targets .prepare +.prepare-go +.prepare-jsx # Compiled Object files, Static and Dynamic libs (Shared Objects) *.o @@ -33,7 +33,7 @@ dist: | build-server build-client go-test package mv ./model/version.go.bak ./model/version.go dist-local: | start-docker dist - + dist-travis: | travis-init build-container start-docker: @@ -153,7 +153,7 @@ go-test: $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1 -test: | start-docker go-test +test: | start-docker .prepare-go go-test travis-init: @echo Setting up enviroment for travis @@ -217,25 +217,29 @@ clean: stop-docker rm -rf Godeps/_workspace/pkg/ rm -f mattermost.log - rm -f .prepare + rm -f .prepare-go .prepare-jsx nuke: | clean clean-docker rm -rf data -.prepare: - @echo Preparation for run step - +.prepare-go: + @echo Preparation for running go code go get $(GOFLAGS) github.com/tools/godep + touch $@ + +.prepare-jsx: + @echo Preparation for compiling jsx code + cd web/react/ && npm install cd web/react/ && npm run build-libs touch $@ -run: start-docker .prepare +run: start-docker .prepare-go .prepare-jsx mkdir -p web/static/js - @echo Starting react processor + @echo Starting react processo cd web/react && npm start & @echo Starting go web server |