Skip to content

Commit 589bc87

Browse files
committed
Improve Makefile parallel check targets
1 parent d91b8eb commit 589bc87

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

Makefile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ GO := go
1010
GOTEST := $(GO) test
1111
GOBUILD := $(GO) build
1212

13-
# Keep tool caches inside the workspace for build/check commands so they work
14-
# in restricted environments without changing the install target's semantics.
15-
CACHE_DIR ?= $(CURDIR)/.cache
16-
CHECK_GOPATH ?= $(CACHE_DIR)/go
17-
CHECK_GOCACHE ?= $(CACHE_DIR)/go-build
18-
CHECK_GOMODCACHE ?= $(CACHE_DIR)/gomod
19-
CHECK_GOLANGCI_LINT_CACHE ?= $(CACHE_DIR)/golangci-lint
20-
GO_RUN_ENV = GOPATH=$(CHECK_GOPATH) GOCACHE=$(CHECK_GOCACHE) GOMODCACHE=$(CHECK_GOMODCACHE)
21-
LINT_RUN_ENV = $(GO_RUN_ENV) GOLANGCI_LINT_CACHE=$(CHECK_GOLANGCI_LINT_CACHE)
13+
# By default, use the system Go cache locations (~/go, ~/Library/Caches, etc.).
14+
# Override CACHE_DIR to keep caches inside the workspace for CI or sandboxed
15+
# environments where the home directory is not writable.
16+
# make check CACHE_DIR=$(CURDIR)/.cache
17+
ifdef CACHE_DIR
18+
GO_RUN_ENV = GOPATH=$(CACHE_DIR)/go GOCACHE=$(CACHE_DIR)/go-build GOMODCACHE=$(CACHE_DIR)/gomod
19+
LINT_RUN_ENV = $(GO_RUN_ENV) GOLANGCI_LINT_CACHE=$(CACHE_DIR)/golangci-lint
20+
else
21+
GO_RUN_ENV =
22+
LINT_RUN_ENV =
23+
endif
2224

2325
# Docker
2426
DOCKER_REPO ?= yeasy/mdpress

0 commit comments

Comments
 (0)