diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2021-03-26 00:17:38 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-03-26 00:21:35 +0300 |
| commit | 63488757fe9c8eba78a0abc497f1f368f225d42d (patch) | |
| tree | 771ce165b878c5a27a43251eb319cd75145d5d7c | |
| parent | dc86abc59880bc3499c301540eb46c51adc93cf5 (diff) | |
Add note about tools.go
| -rw-r--r-- | .gitlab/ci/test.yml | 1 | ||||
| -rw-r--r-- | Makefile.build.mk | 4 | ||||
| -rw-r--r-- | Makefile.util.mk | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 609c7d7d..4ca9a29e 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -43,6 +43,7 @@ test-acceptance:1.14: test:1.15: extends: .tests-unit image: golang:1.15 + test-acceptance:1.15: extends: .tests-acceptance-deamon image: golang:1.15 diff --git a/Makefile.build.mk b/Makefile.build.mk index 7a3d9543..debd1941 100644 --- a/Makefile.build.mk +++ b/Makefile.build.mk @@ -1,5 +1,3 @@ -GOLANGCI_LINT_VERSION := v1.27.0 # version used by $GOLANGCI_LINT_IMAGE - GO_BUILD_TAGS := continuous_profiler_stackdriver .PHONY: all setup generate-mocks build clean @@ -8,7 +6,7 @@ all: gitlab-pages setup: .GOPATH/.ok mkdir -p bin/ - # From https://marcofranssen.nl/manage-go-tools-via-go-modules/ + # Installing dev tools defined in tools.go @cat ./tools.go | \ grep _ | \ awk -F'"' '{print $$2}' | \ diff --git a/Makefile.util.mk b/Makefile.util.mk index 6fa4e319..951c0ba2 100644 --- a/Makefile.util.mk +++ b/Makefile.util.mk @@ -1,5 +1,3 @@ -GOLANGCI_LINT_IMAGE := golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) - .PHONY: lint test race acceptance bench cover list deps-check deps-download changelog OUT_FORMAT ?= colored-line-number |