From 35735bbef982fa2268dd90c7ca709f9e9ff00efc Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 3 Aug 2021 19:32:01 +0100 Subject: Upgrade to golang-jwt 3.2.2 (#16590) * Upgrade to golang-jwt 3.2.2 Upgrade to the latest version of golang-jwt Signed-off-by: Andrew Thornton * Forcibly replace the 3.2.1 version of golang-jwt/jwt and increase minimum Go version Using go.mod we can forcibly replace the 3.2.1 version used by goth to 3.2.2. Further given golang-jwt/jwts stated policy of only supporting supported go versions we should just raise our minimal version of go to 1.16 for 1.16 as by time of release 1.15 will be out of support. Signed-off-by: Andrew Thornton * update minimal go required Signed-off-by: Andrew Thornton * update config.yaml Signed-off-by: Andrew Thornton Co-authored-by: 6543 <6543@obermui.de> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a0f5fdab30..2fbd840c87 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" ) COMMA := , XGO_VERSION := go-1.16.x -MIN_GO_VERSION := 001014000 +MIN_GO_VERSION := 001016000 MIN_NODE_VERSION := 012017000 DOCKER_IMAGE ?= gitea/gitea @@ -200,7 +200,7 @@ help: go-check: $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell $(GO) version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ');)) @if [ "$(GO_VERSION)" -lt "$(MIN_GO_VERSION)" ]; then \ - echo "Gitea requires Go 1.14 or greater to build. You can get it at https://golang.org/dl/"; \ + echo "Gitea requires Go 1.16 or greater to build. You can get it at https://golang.org/dl/"; \ exit 1; \ fi -- cgit v1.2.3