Skip to content

Commit c28967e

Browse files
committed
mix of makefile and action
1 parent f8f0dd5 commit c28967e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/actions/run-tests/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ runs:
4747
RCE_DOCKER: "true"
4848
RE_CLUSTER: "false"
4949
run: |
50-
go test ./... -short -race && \
51-
go test -coverprofile=coverage.txt -covermode=atomic ./... && \
50+
make test.ci
5251
shell: bash

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ redisstackdocker.stop:
99

1010
test: testdeps
1111
$(MAKE) redisstackdocker.start
12+
$(MAKE) test.ci
13+
$(MAKE) redisstackdocker.stop
14+
15+
testdeps: testdata/redis/src/redis-server
16+
17+
test.ci:
1218
$(eval GO_VERSION := $(shell go version | cut -d " " -f 3 | cut -d. -f2))
1319
set -e; for dir in $(GO_MOD_DIRS); do \
1420
if echo "$${dir}" | grep -q "./example" && [ "$(GO_VERSION)" = "19" ]; then \
@@ -26,9 +32,6 @@ test: testdeps
2632
done
2733
cd internal/customvet && go build .
2834
go vet -vettool ./internal/customvet/customvet
29-
$(MAKE) redisstackdocker.stop
30-
31-
testdeps: testdata/redis/src/redis-server
3235

3336
bench:
3437
go test ./... -test.run=NONE -test.bench=. -test.benchmem

0 commit comments

Comments
 (0)