diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04ddb7bef..46c713967 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: needs: build runs-on: ubuntu-22.04 env: - COLOR_GOTEST_ENABLED: enabled + GOTESTSUM_ENABLED: enabled steps: - name: checkout code uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index b0c83eb25..0ff7f0c9d 100644 --- a/Makefile +++ b/Makefile @@ -102,26 +102,27 @@ push-chart: helm push _output/charts/karmada-chart-${VERSION}.tgz oci://docker.io/karmada helm push _output/charts/karmada-operator-chart-${VERSION}.tgz oci://docker.io/karmada -COLOR_GOTEST_REGISTRY:=github.com/rakyll/gotest -COLOR_GOTEST_VERSION:=aeb9f1f4739020c60963f21eec2e65672307a9ac -COLOR_GOTEST_ENABLED?= -GOTEST_PALETTE?=hired,higreen +GOTESTSUM_REGISTRY:=gotest.tools/gotestsum +GOTESTSUM_VERSION:=ec99a250836f069a524bb9d9b5de0a7a96334ea7 # v1.11.0 +GOTESTSUM_FLAGS?=--format testname +GOTESTSUM_ENABLED?= GOTEST=go test -.PHONY: install_gotest -install_gotest: -ifdef COLOR_GOTEST_ENABLED - go install ${COLOR_GOTEST_REGISTRY}@${COLOR_GOTEST_VERSION} -GOTEST=gotest +.PHONY: install_gotestsum +install_gotestsum: +ifdef GOTESTSUM_ENABLED + go install ${GOTESTSUM_REGISTRY}@${GOTESTSUM_VERSION} +GOTEST=gotestsum ${GOTESTSUM_FLAGS} -- endif .PHONY: test -test: install_gotest +test: GO_TEST_FLAGS ?= --race --v -covermode=atomic +test: install_gotestsum mkdir -p ./_output/coverage/ - $(GOTEST) --race --v ./pkg/... -coverprofile=./_output/coverage/coverage_pkg.txt -covermode=atomic - $(GOTEST) --race --v ./cmd/... -coverprofile=./_output/coverage/coverage_cmd.txt -covermode=atomic - $(GOTEST) --race --v ./examples/... -coverprofile=./_output/coverage/coverage_examples.txt -covermode=atomic - $(GOTEST) --race --v ./operator/... -coverprofile=./_output/coverage/coverage_operator.txt -covermode=atomic + $(GOTEST) $(GO_TEST_FLAGS) ./pkg/... -coverprofile=./_output/coverage/coverage_pkg.txt + $(GOTEST) $(GO_TEST_FLAGS) ./cmd/... -coverprofile=./_output/coverage/coverage_cmd.txt + $(GOTEST) $(GO_TEST_FLAGS) ./examples/... -coverprofile=./_output/coverage/coverage_examples.txt + $(GOTEST) $(GO_TEST_FLAGS) ./operator/... -coverprofile=./_output/coverage/coverage_operator.txt upload-images: images @echo "push images to $(REGISTRY)"