ci: fix CI issues and improve make script (#562)

* fix ci issue * gitignore * make all * clean build output Signed-off-by: seeflood <[email protected]>
mosn · May 14, 2022 · 15daa68 · 15daa68
1 parent b248836
commit 15daa68
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,24 @@ application.pid
 *.orig
 
 # integrate test
-integrate_test.sh
+integrate_test.sh
+
+# production of quickstart testing
+cmd/layotto/layotto
+cmd/layotto/nohup.out
+cmd/layotto_multiple_api/layotto
+cmd/layotto_multiple_api/nohup.out
+default.etcd/
+demo/configuration/common/client
+demo/file/client
+demo/flowcontrol/client
+demo/lock/redis/client
+demo/pubsub/redis/client/publisher
+demo/pubsub/redis/server/nohup.out
+demo/pubsub/redis/server/subscriber
+demo/sequencer/common/client
+demo/state/common/client
+etc/script/mdx
+etcd
+layotto_wasmer
+nohup.out
diff --git a/Makefile b/Makefile
@@ -243,7 +243,7 @@ clean:
 ## all: Run format codes, check codes, build Layotto codes for host platform with one command
 # ==============================================================================
 .PHONY: all
-all: format check.style check.unit check.lint build
+all: clean format check style.quickstart clean
 
 # ==============================================================================
 # Usage

diff --git a/etc/script/test-quickstart.sh b/etc/script/test-quickstart.sh
@@ -53,7 +53,7 @@ sh etc/script/download_etcd.sh
 # release all resources
 release_resource() {
   # kill processes
-  processes="layotto layotto_wasmer etcd go"
+  processes="layotto layotto_wasmer etcd server client go"
   for key in ${processes}; do
     if killall $key; then
       echo "$key released"

diff --git a/make/golang.mk b/make/golang.mk
@@ -62,6 +62,24 @@ go.clean:
 	@echo "===========> Cleaning all build output"
 	@rm -rf $(OUTPUT_DIR)
 	@rm -rf $(ROOT_DIR)/cover.out
+	@rm -f cmd/layotto/layotto
+	@rm -f cmd/layotto/nohup.out
+	@rm -f cmd/layotto_multiple_api/layotto
+	@rm -f cmd/layotto_multiple_api/nohup.out
+	@rm -rf default.etcd/
+	@rm -f demo/configuration/common/client
+	@rm -f demo/file/client
+	@rm -f demo/flowcontrol/client
+	@rm -f demo/lock/redis/client
+	@rm -f demo/pubsub/redis/client/publisher
+	@rm -f demo/pubsub/redis/server/nohup.out
+	@rm -f demo/pubsub/redis/server/subscriber
+	@rm -f demo/sequencer/common/client
+	@rm -f demo/state/common/client
+	@rm -f etc/script/mdx
+	@rm -f etcd
+	@rm -f layotto_wasmer
+	@rm -f nohup.out
 
 .PHONY: go.lint.verify
 go.lint.verify: