Skip to content

Commit

Permalink
refactor: bump go1.17.2 to go1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
colin404 committed Dec 5, 2023
1 parent 6a8f18a commit 890ed25
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/marmotedu/iam

go 1.18
go 1.21.4

require (
github.com/AlekSi/pointer v1.1.0
Expand Down
4 changes: 0 additions & 4 deletions scripts/make-rules/golang.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#

GO := go
GO_SUPPORTED_VERSIONS ?= 1.13|1.14|1.15|1.16|1.17|1.18|1.19|1.20
GO_LDFLAGS += -X $(VERSION_PACKAGE).GitVersion=$(VERSION) \
-X $(VERSION_PACKAGE).GitCommit=$(GIT_COMMIT) \
-X $(VERSION_PACKAGE).GitTreeState=$(GIT_TREE_STATE) \
Expand Down Expand Up @@ -45,9 +44,6 @@ EXCLUDE_TESTS=github.com/marmotedu/iam/test github.com/marmotedu/iam/pkg/log git

.PHONY: go.build.verify
go.build.verify:
ifneq ($(shell $(GO) version | grep -q -E '\bgo($(GO_SUPPORTED_VERSIONS))\b' && echo 0 || echo 1), 0)
$(error unsupported go version. Please make install one of the following supported version: '$(GO_SUPPORTED_VERSIONS)')
endif

.PHONY: go.build.%
go.build.%:
Expand Down

0 comments on commit 890ed25

Please sign in to comment.