Skip to content

Commit 15daa68

Browse files
authored
ci: fix CI issues and improve make script (#562)
* fix ci issue * gitignore * make all * clean build output Signed-off-by: seeflood <[email protected]>
1 parent b248836 commit 15daa68

File tree

4 files changed

+41
-3
lines changed

4 files changed

+41
-3
lines changed

.gitignore

+21-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,24 @@ application.pid
4141
*.orig
4242

4343
# integrate test
44-
integrate_test.sh
44+
integrate_test.sh
45+
46+
# production of quickstart testing
47+
cmd/layotto/layotto
48+
cmd/layotto/nohup.out
49+
cmd/layotto_multiple_api/layotto
50+
cmd/layotto_multiple_api/nohup.out
51+
default.etcd/
52+
demo/configuration/common/client
53+
demo/file/client
54+
demo/flowcontrol/client
55+
demo/lock/redis/client
56+
demo/pubsub/redis/client/publisher
57+
demo/pubsub/redis/server/nohup.out
58+
demo/pubsub/redis/server/subscriber
59+
demo/sequencer/common/client
60+
demo/state/common/client
61+
etc/script/mdx
62+
etcd
63+
layotto_wasmer
64+
nohup.out

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ clean:
243243
## all: Run format codes, check codes, build Layotto codes for host platform with one command
244244
# ==============================================================================
245245
.PHONY: all
246-
all: format check.style check.unit check.lint build
246+
all: clean format check style.quickstart clean
247247

248248
# ==============================================================================
249249
# Usage

etc/script/test-quickstart.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ sh etc/script/download_etcd.sh
5353
# release all resources
5454
release_resource() {
5555
# kill processes
56-
processes="layotto layotto_wasmer etcd go"
56+
processes="layotto layotto_wasmer etcd server client go"
5757
for key in ${processes}; do
5858
if killall $key; then
5959
echo "$key released"

make/golang.mk

+18
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,24 @@ go.clean:
6262
@echo "===========> Cleaning all build output"
6363
@rm -rf $(OUTPUT_DIR)
6464
@rm -rf $(ROOT_DIR)/cover.out
65+
@rm -f cmd/layotto/layotto
66+
@rm -f cmd/layotto/nohup.out
67+
@rm -f cmd/layotto_multiple_api/layotto
68+
@rm -f cmd/layotto_multiple_api/nohup.out
69+
@rm -rf default.etcd/
70+
@rm -f demo/configuration/common/client
71+
@rm -f demo/file/client
72+
@rm -f demo/flowcontrol/client
73+
@rm -f demo/lock/redis/client
74+
@rm -f demo/pubsub/redis/client/publisher
75+
@rm -f demo/pubsub/redis/server/nohup.out
76+
@rm -f demo/pubsub/redis/server/subscriber
77+
@rm -f demo/sequencer/common/client
78+
@rm -f demo/state/common/client
79+
@rm -f etc/script/mdx
80+
@rm -f etcd
81+
@rm -f layotto_wasmer
82+
@rm -f nohup.out
6583

6684
.PHONY: go.lint.verify
6785
go.lint.verify:

0 commit comments

Comments
 (0)