From 6200c8e551774046849aafbbc28a74f485e15749 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral <38422348+umarcor@users.noreply.github.com> Date: Fri, 25 Nov 2022 20:55:09 +0000 Subject: [PATCH] Makefile: add target richtest (#1865) Don't require contributors to install richgo but keep it as an option and for CI --- .github/workflows/test.yml | 4 ++-- Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a55d39fe..7f047352 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,7 +88,7 @@ jobs: go install github.com/kyoh86/richgo"${_version}" go install github.com/mitchellh/gox"${_version}" - - run: RICHGO_FORCE_COLOR=1 PATH=$HOME/go/bin/:$PATH make test + - run: RICHGO_FORCE_COLOR=1 PATH=$HOME/go/bin/:$PATH make richtest test-win: @@ -125,4 +125,4 @@ jobs: go install github.com/kyoh86/richgo@latest go install github.com/mitchellh/gox@latest - - run: RICHGO_FORCE_COLOR=1 PATH=$HOME/go/bin:$PATH make test + - run: RICHGO_FORCE_COLOR=1 PATH=$HOME/go/bin:$PATH make richtest diff --git a/Makefile b/Makefile index c433a01b..0da8d7aa 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,6 @@ ifeq (, $(shell which golangci-lint)) $(warning "could not find golangci-lint in $(PATH), run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh") endif -ifeq (, $(shell which richgo)) -$(warning "could not find richgo in $(PATH), run: go install github.com/kyoh86/richgo@latest") -endif - .PHONY: fmt lint test install_deps clean default: all @@ -25,6 +21,10 @@ lint: test: install_deps $(info ******************** running tests ********************) + go test -v ./... + +richtest: install_deps + $(info ******************** running tests with kyoh86/richgo ********************) richgo test -v ./... install_deps: