From 787d72cf52df995cb6e2c19330db85c51d79ad03 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Tue, 5 Oct 2021 10:50:58 +0300 Subject: [PATCH 1/3] Use install, not go get --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b3aed6e..60f1424 100644 --- a/Makefile +++ b/Makefile @@ -83,15 +83,15 @@ install-tools-lint: .bin .PHONY: install-tools-godoc install-tools-godoc: .bin - @$(GOTOOL) go get -u golang.org/x/tools/cmd/godoc + @$(GOTOOL) go install golang.org/x/tools/cmd/godoc@latest .PHONY: install-tools-gofumpt install-tools-gofumpt: .bin - @$(GOTOOL) go get -u mvdan.cc/gofumpt + @$(GOTOOL) go install mvdan.cc/gofumpt@latest .PHONY: goreleaser install-tools-goreleaser: .bin - @$(GOTOOL) go get -u github.com/goreleaser/goreleaser + @$(GOTOOL) go install github.com/goreleaser/goreleaser@latest .PHONY: update-deps update-deps: From eb32766c1f4f27fa0d0e4afadf183290dbe60b73 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Tue, 5 Oct 2021 10:51:15 +0300 Subject: [PATCH 2/3] Update to golangci-lint 1.42.1 --- .github/workflows/ci.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0abb9f3..822e0ec 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -83,7 +83,7 @@ jobs: - name: Run linter uses: golangci/golangci-lint-action@v2 with: - version: v1.42.0 + version: v1.42.1 docker: name: Docker diff --git a/Makefile b/Makefile index 60f1424..7766789 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) IMAGE_NAME := mtg APP_NAME := $(IMAGE_NAME) -GOLANGCI_LINT_VERSION := v1.42.0 +GOLANGCI_LINT_VERSION := v1.42.1 VERSION_GO := $(shell go version) VERSION_DATE := $(shell date -Ru) From 9f6f906786d8dc988994f3ef43bcfbaae5c44024 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Tue, 5 Oct 2021 10:51:41 +0300 Subject: [PATCH 3/3] Add go:build comments --- internal/utils/rlimit.go | 1 + internal/utils/rlimit_windows.go | 1 + internal/utils/root_context.go | 1 + internal/utils/root_context_windows.go | 1 + 4 files changed, 4 insertions(+) diff --git a/internal/utils/rlimit.go b/internal/utils/rlimit.go index b474076..82fbb1e 100644 --- a/internal/utils/rlimit.go +++ b/internal/utils/rlimit.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package utils diff --git a/internal/utils/rlimit_windows.go b/internal/utils/rlimit_windows.go index 58bdf39..06229a3 100644 --- a/internal/utils/rlimit_windows.go +++ b/internal/utils/rlimit_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package utils diff --git a/internal/utils/root_context.go b/internal/utils/root_context.go index 9fe4b49..0f24c3f 100644 --- a/internal/utils/root_context.go +++ b/internal/utils/root_context.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package utils diff --git a/internal/utils/root_context_windows.go b/internal/utils/root_context_windows.go index 9a5b6e0..97b66b7 100644 --- a/internal/utils/root_context_windows.go +++ b/internal/utils/root_context_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package utils