Skip to content

Commit e01db63

Browse files
committed
bump to go v1.26 and golangci-lint to v2.10.1
Add check to Makefile for golangci-lint
1 parent 288eea4 commit e01db63

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ DESCRIPTION := AWS SSO CLI
3535
BUILDINFOS ?= $(shell date +%FT%T%z)$(BUILDINFOSDET)
3636
LDFLAGS := -X "main.Version=$(PROJECT_VERSION)" -X "main.Delta=$(PROJECT_DELTA)" -X "main.Buildinfos=$(BUILDINFOS)" -X "main.Tag=$(PROJECT_TAG)" -X "main.CommitID=$(PROJECT_COMMIT)"
3737
OUTPUT_NAME := $(DIST_DIR)$(PROJECT_NAME)-$(PROJECT_VERSION) # default for current platform
38+
GOLANG_CILINT_VERSION := 2.10.1
3839

3940
#ifeq ($(GOOS),darwin)
4041
# https://github.com/golang/go/issues/61229#issuecomment-1988965927
@@ -188,9 +189,20 @@ test-tidy: ## Test to make sure go.mod is tidy
188189
exit -1 ; \
189190
fi
190191

191-
lint: ## Run golangci-lint
192+
lint: .lint-check ## Run golangci-lint
192193
golangci-lint run
193194

195+
lint-install: ## Install golangci-lint
196+
curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b $(go env GOPATH)/bin v$(GOLANG_CILINT_VERSION)
197+
198+
.lint-check:
199+
if test $$(golangci-lint --version 2>&1 | grep -c "version $(GOLANG_CILINT_VERSION)") -eq 0 ; then \
200+
echo "Need to install golangci-lint $(GOLANG_CILINT_VERSION)" ; \
201+
echo "Run: make lint-install" ; \
202+
exit -1 ; \
203+
fi
204+
205+
194206
test-homebrew: $(DIST_DIR)$(PROJECT_NAME) ## Run the homebrew tests
195207
@$(DIST_DIR)$(PROJECT_NAME) --config /dev/null version 2>/dev/null | grep -q "AWS SSO CLI Version $(PROJECT_VERSION)"
196208
@$(DIST_DIR)$(PROJECT_NAME) --config /dev/null 2>&1 | grep -q "no AWS SSO providers have been configured"

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/synfinatic/aws-sso-cli
22

3-
go 1.23.0
3+
go 1.26.0
44

5-
toolchain go1.23.6
5+
// toolchain go1.23.6
66

77
require (
88
github.com/99designs/keyring v1.2.2

0 commit comments

Comments
 (0)