Skip to content

Commit a77cb9d

Browse files
committed
use go 1.23.6
1 parent 29d036a commit a77cb9d

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

Makefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -508,11 +508,7 @@ 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-
@# 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)
511+
$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
516512

517513
vendor: go.mod go.sum
518514
$(GO) mod vendor
@@ -531,7 +527,7 @@ tidy-check: tidy
531527
go-licenses: $(GO_LICENSE_FILE)
532528

533529
$(GO_LICENSE_FILE): go.mod go.sum
534-
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR)
530+
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
535531
$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
536532
@rm -rf $(GO_LICENSE_TMP_DIR)
537533

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
3+
go 1.23.6
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)