summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml61
-rw-r--r--Makefile39
2 files changed, 70 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index fc2fb7646..898cbf812 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,39 @@
language: go
-
go:
- - 1.4.2
-
+- 1.4.2
before_install:
- - gem install compass
- - "sudo apt-get update -qq"
-
- - "sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5"
- - "sudo apt-get autoremove"
- - "sudo apt-get install libaio1"
- - "wget -O mysql-5.6.17.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.17-debian6.0-x86_64.deb"
- - "sudo dpkg -i mysql-5.6.17.deb"
- - "sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server"
- - "sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/"
- # some config values were changed since 5.5
- - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf"
- - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf"
- - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf"
- - "sudo /etc/init.d/mysql.server start"
-
+- gem install compass
+- sudo apt-get update -qq
+- sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5
+ mysql-client-core-5.5
+- sudo apt-get autoremove
+- sudo apt-get install libaio1
+- wget -O mysql-5.6.17.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.17-debian6.0-x86_64.deb
+- sudo dpkg -i mysql-5.6.17.deb
+- sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server
+- sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/
+- sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf
+- sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf
+- sudo sed -i'' 's/basedir[^=]\+=.*$/basedir = \/opt\/mysql\/server-5.6/' /etc/mysql/my.cnf
+- sudo /etc/init.d/mysql.server start
install:
- - export PATH=$PATH:$HOME/gopath/bin
- - go get github.com/tools/godep
- - godep restore
-
+- export PATH=$PATH:$HOME/gopath/bin
+- go get github.com/tools/godep
+- godep restore
before_script:
- - mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot
- - mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot
- - mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot
-
+- mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot
+- mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot
+- mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot
services:
- - redis-server
-
+- redis-server
addons:
hosts:
- - 127.0.0.1 dockerhost \ No newline at end of file
+ - 127.0.0.1 dockerhost
+deploy:
+ provider: releases
+ api_key:
+ secure: ma8Y0oimU+LB6LTAh8to2E1/ghaDPhcsAFXBrODsHpd4JgxA6HYoEwSEBCJFHSpu/JteclsxSTfp9hcuzw/IOtlwlSAiVoBZ60s24MRKTIAQNtrJ4QrX5wyfAZi+Bcuk/E8NynmoIW5qpaElSAdjgocyjAJIQ5ChMEztglL0cAEBXQRWbWMqSZ0hVLPrKDCIkWIyv3pFxqdLOxktkzxW07r2dlT0hppXR3dCaPJo0nelArS2H3LdN/3Iv6cAddfS27RaZkqDj/PDh6OZr4EguC99TxlVNChIr7nPr3/OiAssbkvEnhlSLeABFO9+7KfutL2WhAjpFXTjtPVq6Qalc8UW0K0gxq//sVfhb1MzjenmdOf06uB2bilQ8kgwHo7dDdRZBqqAtxQ6Q0Ht3SFMj6v/1zVD3s+YX/kWCEbUTHm6r2G/eF794ozcJyU+6j1L8hm6mvf8Mr9XCqBfgpZy6FCLX+9OKdMvX2jY8reo3Xz1PA9R6yzhN08vjku+jW+fsoYrBLd0fY1UGK2uOuvBByCeJzXupd3YpBMjEyRupVxqEj7K0GWOJeml65mkqKSNsHdDSeSjMpb8mwneZyTbdjsxCFQRLcLgpAajFrkk4G2Yz3KfhXSo29XKEGX+EbY5NuP8KmDsBsguPI0zfwv/co0hAY8PIIcehxcdoR9Vb2c=
+ file: dist/mattermost.tar.gz
+ skip_cleanup: true
+ on:
+ repo: mattermost/platform
diff --git a/Makefile b/Makefile
index 14a6ffc7d..947e2d367 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,12 @@ ifeq ($(BUILD_NUMBER),)
BUILD_NUMBER := dev
endif
+ifeq ($(TRAVIS_BUILD_NUMBER),)
+ BUILD_NUMBER := dev
+else
+ BUILD_NUMBER := $(TRAVIS_BUILD_NUMBER)
+endif
+
DIST_ROOT=dist
DIST_PATH=$(DIST_ROOT)/mattermost
DIST_RESULTS=$(DIST_ROOT)/results
@@ -29,6 +35,7 @@ travis:
@cd web/react/ && npm install
@$(GO) build $(GOFLAGS) ./...
+ @$(GO) install $(GOFLAGS) -a ./...
@mkdir -p logs
@@ -38,6 +45,38 @@ travis:
@$(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
+ mkdir -p $(DIST_PATH)/bin
+ cp $(GOPATH)/bin/platform $(DIST_PATH)/bin
+
+ cp -RL config $(DIST_PATH)/config
+ touch $(DIST_PATH)/config/build.txt
+ echo $(BUILD_NUMBER) | tee -a $(DIST_PATH)/config/build.txt
+
+ mkdir -p $(DIST_PATH)/logs
+
+ mkdir -p web/static/js
+ cd web/react && npm run build
+
+ cd web/sass-files && compass compile
+
+ mkdir -p $(DIST_PATH)/web
+ cp -RL web/static $(DIST_PATH)/web
+ cp -RL web/templates $(DIST_PATH)/web
+
+ mkdir -p $(DIST_PATH)/api
+ cp -RL api/templates $(DIST_PATH)/api
+
+ mv $(DIST_PATH)/web/static/js/bundle.min.js $(DIST_PATH)/web/static/js/bundle-$(BUILD_NUMBER).min.js
+
+ @sed -i'.bak' 's|react-with-addons-0.13.1.js|react-with-addons-0.13.1.min.js|g' $(DIST_PATH)/web/templates/head.html
+ @sed -i'.bak' 's|jquery-1.11.1.js|jquery-1.11.1.min.js|g' $(DIST_PATH)/web/templates/head.html
+ @sed -i'.bak' 's|bootstrap-3.3.1.js|bootstrap-3.3.1.min.js|g' $(DIST_PATH)/web/templates/head.html
+ @sed -i'.bak' 's|perfect-scrollbar.js|perfect-scrollbar.min.js|g' $(DIST_PATH)/web/templates/head.html
+ @sed -i'.bak' 's|bundle.js|bundle-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html
+ rm $(DIST_PATH)/web/templates/*.bak
+
+ tar -C dist -czf $(DIST_PATH).tar.gz mattermost
+
build:
@$(GO) build $(GOFLAGS) ./...