From c61fac453d8099203ca602b8103b100a0bae96cb Mon Sep 17 00:00:00 2001
From: jason-gao <3048789891@qq.com>
Date: Mon, 9 Dec 2019 17:40:25 +0800
Subject: [PATCH] update travis

---
 .travis.yml      | 20 +++++++++++++-------
 Makefile         |  6 ++++++
 mergeUpstream.sh |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f21e1d..7c3459a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,17 @@ go:
   - 1.13.x
   - master
 
-script:
-  - go build 
-  - ./fileboy version
-  - ./fileboy help
-  - ./fileboy init
-  - cat filegirl.yaml
-  - ./fileboy exec 
+
+notifications:
+  email:
+    recipients:
+      - 3048789891@qq.com
+    on_success: change # default: change
+    on_failure: always # default: always
+
+
+script:
+  - make init
+  - make build-mac
+  - make start-mac
 
diff --git a/Makefile b/Makefile
index 5433b28..4ecba34 100644
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,21 @@ build-win: ;@echo "编译-windows版";
 build-all: build-mac build-linux build-win
 
 start-linux: ;@echo "启动服务";
+	./bin/fileboy-linux-amd64.bin help
 	./bin/fileboy-linux-amd64.bin init
+	cat filegirl.yaml
 	./bin/fileboy-linux-amd64.bin
 
 start-mac: ;@echo "启动服务";
+	./bin/fileboy-darwin-amd64.bin help
 	./bin/fileboy-darwin-amd64.bin init
+	cat filegirl.yaml
 	./bin/fileboy-darwin-amd64.bin
 
 start-win: ;@echo "启动服务";
+	./bin/fileboy-windows-amd64.exe help
 	./bin/fileboy-windows-amd64.exe init
+	cat filegirl.yaml
 	./bin/fileboy-windows-amd64.exe
 
 build-start-mac: build-mac start-mac
diff --git a/mergeUpstream.sh b/mergeUpstream.sh
index 15074e5..926f648 100755
--- a/mergeUpstream.sh
+++ b/mergeUpstream.sh
@@ -4,4 +4,4 @@
 git remote add upstream https://github.com/dengsgo/fileboy.git
 git fetch upstream
 git checkout master
-git merge upstream/master
\ No newline at end of file
+git merge upstream/master