update travis CI

jiadiwu · Mar 22, 2019 · 6d5b491 · 6d5b491
1 parent d4595c8
commit 6d5b491
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,12 @@
-os: osx
+os:
+  - osx
+  - linux
 language: cpp
 
 script:
   - make
-  - make master
-  - make ps
-  - make worker
-  - make ring_master
-  - make ring_worker
+  - build.sh 3 3 127.0.0.1:17832
+  - build_ring.sh 3 127.0.0.1:17832
 
 notifications:
   email:

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ ring_master : $(DISTRIBUT)
 ring_worker : $(DISTRIBUT)
 
 $(BIN) :
-	$(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c, $^) -Xlinker $(ZMQ_LIB) $(LDFLAGS)
+	$(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c, $^) -Xlinker $(LDFLAGS)
 
 master :
 	$(CXX) $(CFLAGS) -o LightCTR_BIN_Master $(filter %.cpp %.o %.c, $^) -D MASTER -Xlinker $(ZMQ_LIB) $(LDFLAGS)

diff --git a/build.sh b/build.sh
@@ -22,7 +22,7 @@ wait
 echo
 echo
 echo "[Build Success]"
-echo "Please copy different BIN file to corresponding machine, DON'T forget expert LightCTR_PS_NUM, LightCTR_WORKER_NUM and LightCTR_MASTER_ADDR, run Master first"
+echo "Please copy different BIN file to corresponding machine, DON'T forget export LightCTR_PS_NUM, LightCTR_WORKER_NUM and LightCTR_MASTER_ADDR, run Master first"
 echo
 echo "[or] Press any key to run clunster on standalone mode"
 read -n 1

diff --git a/build_ring.sh b/build_ring.sh
@@ -20,7 +20,7 @@ wait
 echo
 echo
 echo "[Build Success]"
-echo "Please copy different BIN file to corresponding machine, DON'T forget expert LightCTR_WORKER_NUM and LightCTR_MASTER_ADDR, run Master first"
+echo "Please copy different BIN file to corresponding machine, DON'T forget export LightCTR_WORKER_NUM and LightCTR_MASTER_ADDR, run Master first"
 echo
 echo "[or] Press any key to run clunster on standalone mode"
 read -n 1