Skip to content

Commit 29d036a

Browse files
committed
try "go 1.23"
1 parent c0ad7e4 commit 29d036a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,11 @@ unit-test-coverage:
508508
tidy:
509509
$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
510510
$(GO) mod tidy -compat=$(MIN_GO_VERSION)
511-
# disabled because of issues related to https://github.com/google/go-licenses/issues/128
512-
# @$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
511+
@# revert "go/toolchain" version, they are updated incorrectly by the "tidy" tool
512+
$(SED_INPLACE) -E -e 's/^(go [0-9]\.[0-9]+).*/\1/g' go.mod go.mod
513+
awk 'BEGIN {skip=0} /^toolchain/ {skip=1; next} skip==1 && /^$$/ {skip=0; next} {skip=0} 1' go.mod > go.mod.new
514+
rm go.mod && mv go.mod.new go.mod
515+
# $(MAKE) --no-print-directory $(GO_LICENSE_FILE)
513516

514517
vendor: go.mod go.sum
515518
$(GO) mod vendor

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module code.gitea.io/gitea
22

3-
go 1.23.6
3+
go 1.23
44

55
// rfc5280 said: "The serial number is an integer assigned by the CA to each certificate."
66
// But some CAs use negative serial number, just relax the check. related:

0 commit comments

Comments
 (0)