Skip to content

Commit

Permalink
Merge pull request #2286 from Shopify/dnwe/fix-makefile
Browse files Browse the repository at this point in the history
chore(ci): fix redirect with GITHUB_STEP_SUMMARY
  • Loading branch information
dnwe authored Jul 20, 2022
2 parents d96db86 + 997eca0 commit 524ce55
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FILES := $(shell find . -name '*.go' -type f -not -name '*.pb.go' -not -name
TESTS := $(shell find . -name '*.go' -type f -not -name '*.pb.go' -not -name '*_generated.go' -name '*_test.go')

$(GOBIN)/tparse:
GOBIN=$(GOBIN) go install github.com/mfridman/tparse@v0.10.3
GOBIN=$(GOBIN) go install github.com/mfridman/tparse@v0.11.1
get:
$(GO) get ./...
$(GO) mod verify
Expand All @@ -29,12 +29,11 @@ lint:
test: $(GOBIN)/tparse
$(GOTEST) -timeout 2m -json ./... \
| tee output.json | $(GOBIN)/tparse -follow -all
[ -z "${GITHUB_STEP_SUMMARY}" ] \
|| NO_COLOR=1 $(GOBIN)/tparse -format markdown -file output.json -all >${GITHUB_STEP_SUMMARY}

[ -z "$${GITHUB_STEP_SUMMARY}" ] \
|| NO_COLOR=1 $(GOBIN)/tparse -format markdown -file output.json -all >"$${GITHUB_STEP_SUMMARY:-/dev/null}"
.PHONY: test_functional
test_functional: $(GOBIN)/tparse
$(GOTEST) -timeout 12m -tags=functional -json ./... \
| tee output.json | $(GOBIN)/tparse -follow -all
[ -z "${GITHUB_STEP_SUMMARY}" ] \
|| NO_COLOR=1 $(GOBIN)/tparse -format markdown -file output.json -all >${GITHUB_STEP_SUMMARY}
[ -z "$${GITHUB_STEP_SUMMARY:-}" ] \
|| NO_COLOR=1 $(GOBIN)/tparse -format markdown -file output.json -all >"$${GITHUB_STEP_SUMMARY:-/dev/null}"

0 comments on commit 524ce55

Please sign in to comment.