diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8880cc9..62643bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,13 +20,17 @@ workflow: build: stage: build + variables: + GOTEST: "gotestsum --junitfile report.xml --format testname -- ./..." before_script: - - apk -q add go staticcheck make scdoc + - apk -q add go gotestsum staticcheck make scdoc script: - make test - make artifacts: expire_in: 1 week + reports: + junit: report.xml vendor: stage: vendor diff --git a/Makefile b/Makefile index 0b1e841..a083548 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,8 @@ GO?=go GOFLAGS?= LDFLAGS+=-s -w -X main.Version=$(VERSION) RM?=rm -f -GOTEST=go test -count=1 -race +GOTESTOPTS?=-count=1 -race +GOTEST?=go test ./... DISABLE_GOGC?= ifeq ($(DISABLE_GOGC),1) @@ -47,10 +48,10 @@ test: fi @staticcheck ./... - @$(GOTEST) ./... + $(GOTEST) $(GOTESTOPTS) clean: - $(RM) mkinitfs $(DOCS) + $(RM) mkinitfs $(DOCS) $(RM) $(VENDORED)* install: $(DOCS) mkinitfs