update travis

.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
 

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

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
+git merge upstream/master