mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Merge pull request #1499 from mattermost/makefile-tweaks

Просмотр исходного кода 
Moving removal of data directory to nuke. Updating dev setup.
Этот коммит содержится в:
Joram Wilander
2015-11-23 11:31:17 -05:00
родитель 60e2314baa 0a5aadc8b2
Коммит c03a985983
2 изменённых файлов: 7 добавлений и 5 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
Makefile
Просмотреть файл

@@ -29,7 +29,7 @@ DOCKER_CONTAINER_NAME ?= mm-test
all: dist-local all: dist-local
dist: | build-server build-client test package dist: | build-server build-client go-test package
mv ./model/version.go.bak ./model/version.go mv ./model/version.go.bak ./model/version.go
dist-local: | start-docker dist dist-local: | start-docker dist
@@ -143,13 +143,15 @@ build-client:
cd web/sass-files && compass compile -e production --force cd web/sass-files && compass compile -e production --force
test: go-test:
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s ./api || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s ./api || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 $(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 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1
test: | start-docker go-test
travis-init: travis-init:
@echo Setting up enviroment for travis @echo Setting up enviroment for travis
@@ -205,7 +207,6 @@ clean: stop-docker
rm -f web/static/js/libs*.js rm -f web/static/js/libs*.js
rm -f web/static/css/styles.css rm -f web/static/css/styles.css
rm -rf data
rm -rf api/data rm -rf api/data
rm -rf logs rm -rf logs
rm -rf web/sass-files/.sass-cache rm -rf web/sass-files/.sass-cache
@@ -216,6 +217,7 @@ clean: stop-docker
rm -f .prepare rm -f .prepare
nuke: | clean clean-docker nuke: | clean clean-docker
rm -rf data
.prepare: .prepare:
@echo Preparation for run step @echo Preparation for run step

4
doc/developer/Setup.md
Просмотреть файл

@@ -11,7 +11,7 @@ Developer Machine Setup
`docker-machine ip dev` `docker-machine ip dev`
3. Add a line to your /etc/hosts that goes `<Docker IP> dockerhost` 3. Add a line to your /etc/hosts that goes `<Docker IP> dockerhost`
4. Run `docker-machine env dev` and copy the export statements to your ~/.bash_profile 4. Run `docker-machine env dev` and copy the export statements to your ~/.bash_profile
2. Download Go (version 1.4.2 or 1.5.1. Final release bits are built with 1.4.2) from http://golang.org/dl/ 2. Download Go 1.5.1 from http://golang.org/dl/
3. Set up your Go workspace 3. Set up your Go workspace
1. `mkdir ~/go` 1. `mkdir ~/go`
2. Add the following to your ~/.bash_profile 2. Add the following to your ~/.bash_profile
@@ -53,7 +53,7 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org
`127.0.0.1 dockerhost` `127.0.0.1 dockerhost`
3. Install build essentials 3. Install build essentials
1. `apt-get install build-essential` 1. `apt-get install build-essential`
4. Download Go (version 1.4.2 or 1.5.1. Final release bits are built with 1.4.2) from http://golang.org/dl/ 4. Download Go 1.5.1 from http://golang.org/dl/
5. Set up your Go workspace and add Go to the PATH 5. Set up your Go workspace and add Go to the PATH
1. `mkdir ~/go` 1. `mkdir ~/go`
2. Add the following to your ~/.bashrc 2. Add the following to your ~/.bashrc