From 70a489ff52b6adf77b8176eb67dbd60bf08776a6 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Feb 2025 22:25:01 -0800 Subject: [PATCH 1/4] upgrade go-crypto from 1.1.5 to 1.1.6 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f7b16ce9aed33..c53331700b1b4 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 - github.com/ProtonMail/go-crypto v1.1.4 + github.com/ProtonMail/go-crypto v1.1.6 github.com/PuerkitoBio/goquery v1.10.0 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3 github.com/alecthomas/chroma/v2 v2.15.0 diff --git a/go.sum b/go.sum index 7ff8d437db475..c9b188b9c0b68 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSC github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/ProtonMail/go-crypto v1.1.4 h1:G5U5asvD5N/6/36oIw3k2bOfBn5XVcZrb7PBjzzKKoE= -github.com/ProtonMail/go-crypto v1.1.4/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw= +github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/goquery v1.10.0 h1:6fiXdLuUvYs2OJSvNRqlNPoBm6YABE226xrbavY5Wv4= github.com/PuerkitoBio/goquery v1.10.0/go.mod h1:TjZZl68Q3eGHNBA8CWaxAN7rOU1EbDz3CWuolcO5Yu4= github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= From c0ad7e470f222159e2847102d65035a0cf574cb7 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Mar 2025 18:54:24 +0800 Subject: [PATCH 2/4] Update go.mod --- go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c53331700b1b4..1f20e162cd836 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module code.gitea.io/gitea -go 1.23.0 - -toolchain go1.23.6 +go 1.23.6 // rfc5280 said: "The serial number is an integer assigned by the CA to each certificate." // But some CAs use negative serial number, just relax the check. related: From 29d036aa767a05e9215df7177efff9b157002a5f Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Mar 2025 19:29:30 +0800 Subject: [PATCH 3/4] try "go 1.23" --- Makefile | 7 +++++-- go.mod | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 169e2a21757da..4606236524b04 100644 --- a/Makefile +++ b/Makefile @@ -508,8 +508,11 @@ unit-test-coverage: tidy: $(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2)) $(GO) mod tidy -compat=$(MIN_GO_VERSION) -# disabled because of issues related to https://github.com/google/go-licenses/issues/128 -# @$(MAKE) --no-print-directory $(GO_LICENSE_FILE) + @# revert "go/toolchain" version, they are updated incorrectly by the "tidy" tool + $(SED_INPLACE) -E -e 's/^(go [0-9]\.[0-9]+).*/\1/g' go.mod go.mod + awk 'BEGIN {skip=0} /^toolchain/ {skip=1; next} skip==1 && /^$$/ {skip=0; next} {skip=0} 1' go.mod > go.mod.new + rm go.mod && mv go.mod.new go.mod + # $(MAKE) --no-print-directory $(GO_LICENSE_FILE) vendor: go.mod go.sum $(GO) mod vendor diff --git a/go.mod b/go.mod index 1f20e162cd836..580eee96c5e4b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module code.gitea.io/gitea -go 1.23.6 +go 1.23 // rfc5280 said: "The serial number is an integer assigned by the CA to each certificate." // But some CAs use negative serial number, just relax the check. related: From b26520a4ed43083ae5170aaf6f2371b4bfb12a91 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Mar 2025 20:07:24 +0800 Subject: [PATCH 4/4] use go 1.23.6 --- Makefile | 8 ++------ go.mod | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4606236524b04..ba98f72550cdf 100644 --- a/Makefile +++ b/Makefile @@ -508,11 +508,7 @@ unit-test-coverage: tidy: $(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2)) $(GO) mod tidy -compat=$(MIN_GO_VERSION) - @# revert "go/toolchain" version, they are updated incorrectly by the "tidy" tool - $(SED_INPLACE) -E -e 's/^(go [0-9]\.[0-9]+).*/\1/g' go.mod go.mod - awk 'BEGIN {skip=0} /^toolchain/ {skip=1; next} skip==1 && /^$$/ {skip=0; next} {skip=0} 1' go.mod > go.mod.new - rm go.mod && mv go.mod.new go.mod - # $(MAKE) --no-print-directory $(GO_LICENSE_FILE) + $(MAKE) --no-print-directory $(GO_LICENSE_FILE) vendor: go.mod go.sum $(GO) mod vendor @@ -531,7 +527,7 @@ tidy-check: tidy go-licenses: $(GO_LICENSE_FILE) $(GO_LICENSE_FILE): go.mod go.sum - -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) + -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null $(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE) @rm -rf $(GO_LICENSE_TMP_DIR) diff --git a/go.mod b/go.mod index 580eee96c5e4b..1f20e162cd836 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module code.gitea.io/gitea -go 1.23 +go 1.23.6 // rfc5280 said: "The serial number is an integer assigned by the CA to each certificate." // But some CAs use negative serial number, just relax the check. related: