From 2aa754f28710dff24e2a8b4adec204b6fa5631f7 Mon Sep 17 00:00:00 2001 From: ZPascal Date: Tue, 26 May 2026 15:38:47 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20Remove=20yaml=20v3=E2=86=92v4=20migratio?= =?UTF-8?q?n=20from=20this=20PR=20(moved=20to=20dedicated=20PR)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- models/unittest/fixtures_loader.go | 2 +- modules/issue/template/unmarshal.go | 2 +- modules/label/parser.go | 2 +- modules/markup/markdown/convertyaml.go | 2 +- modules/markup/markdown/meta.go | 2 +- modules/markup/markdown/renderconfig.go | 2 +- modules/markup/markdown/renderconfig_test.go | 2 +- modules/migration/file_format.go | 2 +- modules/optional/serialization.go | 2 +- modules/optional/serialization_test.go | 2 +- modules/packages/helm/metadata.go | 2 +- modules/packages/pub/metadata.go | 2 +- modules/packages/rubygems/metadata.go | 2 +- modules/structs/issue.go | 2 +- modules/structs/issue_test.go | 4 ++-- routers/api/packages/helm/helm.go | 2 +- routers/web/devtest/mail_preview.go | 2 +- services/issue/template.go | 2 +- services/migrations/dump.go | 2 +- services/migrations/restore.go | 2 +- tests/integration/api_issue_config_test.go | 2 +- tests/integration/api_packages_helm_test.go | 2 +- tests/integration/dump_restore_test.go | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index fc57df2ed0..01a4459d80 100644 --- a/go.mod +++ b/go.mod @@ -119,6 +119,7 @@ require ( google.golang.org/grpc v1.81.1 google.golang.org/protobuf v1.36.11 gopkg.in/ini.v1 v1.67.2 + gopkg.in/yaml.v3 v3.0.1 modernc.org/sqlite v1.50.1 mvdan.cc/xurls/v2 v2.6.0 strk.kbt.io/projects/go/libravatar v0.0.0-20260301104140-add494e31dab @@ -287,7 +288,6 @@ require ( golang.org/x/tools v0.44.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260401020348-3a24fdc17823 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/libc v1.72.3 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect diff --git a/models/unittest/fixtures_loader.go b/models/unittest/fixtures_loader.go index d77e28fae5..e2f2f5846f 100644 --- a/models/unittest/fixtures_loader.go +++ b/models/unittest/fixtures_loader.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/models/db" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" "xorm.io/xorm" "xorm.io/xorm/schemas" ) diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index 2abf72fc7c..ceab6babf4 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -14,7 +14,7 @@ import ( api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) // CouldBe indicates a file with the filename could be a template, diff --git a/modules/label/parser.go b/modules/label/parser.go index 635d319614..2a10152062 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/modules/options" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) type labelFile struct { diff --git a/modules/markup/markdown/convertyaml.go b/modules/markup/markdown/convertyaml.go index 3034fae2bc..04664a9c1d 100644 --- a/modules/markup/markdown/convertyaml.go +++ b/modules/markup/markdown/convertyaml.go @@ -11,7 +11,7 @@ import ( "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func nodeToTable(meta *yaml.Node) ast.Node { diff --git a/modules/markup/markdown/meta.go b/modules/markup/markdown/meta.go index ecc0b81098..6ddd892110 100644 --- a/modules/markup/markdown/meta.go +++ b/modules/markup/markdown/meta.go @@ -9,7 +9,7 @@ import ( "unicode" "unicode/utf8" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func isYAMLSeparator(line []byte) bool { diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go index 19e15f4886..d8b1b10ce6 100644 --- a/modules/markup/markdown/renderconfig.go +++ b/modules/markup/markdown/renderconfig.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/modules/markup" "github.com/yuin/goldmark/ast" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) // RenderConfig represents rendering configuration for this file diff --git a/modules/markup/markdown/renderconfig_test.go b/modules/markup/markdown/renderconfig_test.go index 84e4ac33f6..53c52177a7 100644 --- a/modules/markup/markdown/renderconfig_test.go +++ b/modules/markup/markdown/renderconfig_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func TestRenderConfig_UnmarshalYAML(t *testing.T) { diff --git a/modules/migration/file_format.go b/modules/migration/file_format.go index 86a1aa90a2..fd6ac45a21 100644 --- a/modules/migration/file_format.go +++ b/modules/migration/file_format.go @@ -13,7 +13,7 @@ import ( "code.gitea.io/gitea/modules/log" "github.com/santhosh-tekuri/jsonschema/v6" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) // schemaLoader implements jsonschema.URLLoader diff --git a/modules/optional/serialization.go b/modules/optional/serialization.go index f9174053bf..345ce56268 100644 --- a/modules/optional/serialization.go +++ b/modules/optional/serialization.go @@ -6,7 +6,7 @@ package optional import ( "code.gitea.io/gitea/modules/json" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func (o *Option[T]) UnmarshalJSON(data []byte) error { diff --git a/modules/optional/serialization_test.go b/modules/optional/serialization_test.go index 12bf747d11..c059294bbb 100644 --- a/modules/optional/serialization_test.go +++ b/modules/optional/serialization_test.go @@ -11,7 +11,7 @@ import ( "code.gitea.io/gitea/modules/optional" "github.com/stretchr/testify/assert" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) type testSerializationStruct struct { diff --git a/modules/packages/helm/metadata.go b/modules/packages/helm/metadata.go index b5e9299458..421fc5e725 100644 --- a/modules/packages/helm/metadata.go +++ b/modules/packages/helm/metadata.go @@ -13,7 +13,7 @@ import ( "code.gitea.io/gitea/modules/validation" "github.com/hashicorp/go-version" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) var ( diff --git a/modules/packages/pub/metadata.go b/modules/packages/pub/metadata.go index 00d24e8483..a2cf6b728a 100644 --- a/modules/packages/pub/metadata.go +++ b/modules/packages/pub/metadata.go @@ -14,7 +14,7 @@ import ( "code.gitea.io/gitea/modules/validation" "github.com/hashicorp/go-version" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) var ( diff --git a/modules/packages/rubygems/metadata.go b/modules/packages/rubygems/metadata.go index fc6c75840f..5c01abc743 100644 --- a/modules/packages/rubygems/metadata.go +++ b/modules/packages/rubygems/metadata.go @@ -14,7 +14,7 @@ import ( "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/validation" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) var ( diff --git a/modules/structs/issue.go b/modules/structs/issue.go index a9dd9ceb90..f108cf3d0a 100644 --- a/modules/structs/issue.go +++ b/modules/structs/issue.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) // StateType issue state type diff --git a/modules/structs/issue_test.go b/modules/structs/issue_test.go index d53077a151..55bd01df49 100644 --- a/modules/structs/issue_test.go +++ b/modules/structs/issue_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func TestIssueTemplate_Type(t *testing.T) { @@ -95,7 +95,7 @@ labels: t.Run(tt.name, func(t *testing.T) { err := yaml.Unmarshal([]byte(tt.content), tt.tmpl) if tt.wantErr != "" { - assert.ErrorContains(t, err, tt.wantErr) + assert.EqualError(t, err, tt.wantErr) } else { assert.NoError(t, err) assert.Equal(t, tt.want, tt.tmpl) diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index f49130ad72..4c1b72d5c0 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -23,7 +23,7 @@ import ( "code.gitea.io/gitea/services/context" packages_service "code.gitea.io/gitea/services/packages" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/web/devtest/mail_preview.go b/routers/web/devtest/mail_preview.go index 9e2c51153e..7b1787d52b 100644 --- a/routers/web/devtest/mail_preview.go +++ b/routers/web/devtest/mail_preview.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/mailer" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func MailPreviewRender(ctx *context.Context) { diff --git a/services/issue/template.go b/services/issue/template.go index f1a78c6ae0..99977c67cf 100644 --- a/services/issue/template.go +++ b/services/issue/template.go @@ -16,7 +16,7 @@ import ( api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) // templateDirCandidates issue templates directory diff --git a/services/migrations/dump.go b/services/migrations/dump.go index d05fd874e5..31fd27cf80 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -26,7 +26,7 @@ import ( "code.gitea.io/gitea/modules/structs" "github.com/google/uuid" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) var _ base.Uploader = &RepositoryDumper{} diff --git a/services/migrations/restore.go b/services/migrations/restore.go index 1b2856a345..d9dd998c7a 100644 --- a/services/migrations/restore.go +++ b/services/migrations/restore.go @@ -12,7 +12,7 @@ import ( base "code.gitea.io/gitea/modules/migration" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) // RepositoryRestorer implements an Downloader from the local directory diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go index 76551069de..06b972d7ee 100644 --- a/tests/integration/api_issue_config_test.go +++ b/tests/integration/api_issue_config_test.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func createIssueConfig(t *testing.T, user *user_model.User, repo *repo_model.Repository, issueConfig map[string]any) { diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index be999940bd..02df4ae906 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -20,7 +20,7 @@ import ( "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func TestPackageHelm(t *testing.T) { diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go index dc2e3e433c..f18994e693 100644 --- a/tests/integration/dump_restore_test.go +++ b/tests/integration/dump_restore_test.go @@ -24,7 +24,7 @@ import ( "code.gitea.io/gitea/services/migrations" "github.com/stretchr/testify/assert" - "go.yaml.in/yaml/v4" + "gopkg.in/yaml.v3" ) func TestDumpRestore(t *testing.T) {