mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-09-15 18:56:59 +00:00
Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v2 (forgejo) (#7367)
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org> Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
This commit is contained in:
parent
51ff4970ec
commit
fed2d81c44
427 changed files with 2043 additions and 2046 deletions
|
@ -28,5 +28,5 @@ func TestSyncRepoBranches(t *testing.T) {
|
|||
assert.Equal(t, "sha1", repo.ObjectFormatName)
|
||||
branch, err := git_model.GetBranch(db.DefaultContext, 1, "master")
|
||||
require.NoError(t, err)
|
||||
assert.EqualValues(t, "master", branch.Name)
|
||||
assert.Equal(t, "master", branch.Name)
|
||||
}
|
||||
|
|
|
@ -63,9 +63,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
|
|||
assert.Equal(t, "user2", payloadCommits[0].Committer.UserName)
|
||||
assert.Equal(t, "User2", payloadCommits[0].Author.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[0].Author.UserName)
|
||||
assert.EqualValues(t, []string{}, payloadCommits[0].Added)
|
||||
assert.EqualValues(t, []string{}, payloadCommits[0].Removed)
|
||||
assert.EqualValues(t, []string{"readme.md"}, payloadCommits[0].Modified)
|
||||
assert.Equal(t, []string{}, payloadCommits[0].Added)
|
||||
assert.Equal(t, []string{}, payloadCommits[0].Removed)
|
||||
assert.Equal(t, []string{"readme.md"}, payloadCommits[0].Modified)
|
||||
|
||||
assert.Equal(t, "27566bd", payloadCommits[1].ID)
|
||||
assert.Equal(t, "good signed commit (with not yet validated email)", payloadCommits[1].Message)
|
||||
|
@ -74,9 +74,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
|
|||
assert.Equal(t, "user2", payloadCommits[1].Committer.UserName)
|
||||
assert.Equal(t, "User2", payloadCommits[1].Author.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[1].Author.UserName)
|
||||
assert.EqualValues(t, []string{}, payloadCommits[1].Added)
|
||||
assert.EqualValues(t, []string{}, payloadCommits[1].Removed)
|
||||
assert.EqualValues(t, []string{"readme.md"}, payloadCommits[1].Modified)
|
||||
assert.Equal(t, []string{}, payloadCommits[1].Added)
|
||||
assert.Equal(t, []string{}, payloadCommits[1].Removed)
|
||||
assert.Equal(t, []string{"readme.md"}, payloadCommits[1].Modified)
|
||||
|
||||
assert.Equal(t, "5099b81", payloadCommits[2].ID)
|
||||
assert.Equal(t, "good signed commit", payloadCommits[2].Message)
|
||||
|
@ -85,9 +85,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
|
|||
assert.Equal(t, "user2", payloadCommits[2].Committer.UserName)
|
||||
assert.Equal(t, "User2", payloadCommits[2].Author.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[2].Author.UserName)
|
||||
assert.EqualValues(t, []string{"readme.md"}, payloadCommits[2].Added)
|
||||
assert.EqualValues(t, []string{}, payloadCommits[2].Removed)
|
||||
assert.EqualValues(t, []string{}, payloadCommits[2].Modified)
|
||||
assert.Equal(t, []string{"readme.md"}, payloadCommits[2].Added)
|
||||
assert.Equal(t, []string{}, payloadCommits[2].Removed)
|
||||
assert.Equal(t, []string{}, payloadCommits[2].Modified)
|
||||
|
||||
assert.Equal(t, "69554a6", headCommit.ID)
|
||||
assert.Equal(t, "not signed commit", headCommit.Message)
|
||||
|
@ -96,9 +96,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
|
|||
assert.Equal(t, "user2", headCommit.Committer.UserName)
|
||||
assert.Equal(t, "User2", headCommit.Author.Name)
|
||||
assert.Equal(t, "user2", headCommit.Author.UserName)
|
||||
assert.EqualValues(t, []string{}, headCommit.Added)
|
||||
assert.EqualValues(t, []string{}, headCommit.Removed)
|
||||
assert.EqualValues(t, []string{"readme.md"}, headCommit.Modified)
|
||||
assert.Equal(t, []string{}, headCommit.Added)
|
||||
assert.Equal(t, []string{}, headCommit.Removed)
|
||||
assert.Equal(t, []string{"readme.md"}, headCommit.Modified)
|
||||
}
|
||||
|
||||
func TestPushCommits_AvatarLink(t *testing.T) {
|
||||
|
|
|
@ -73,7 +73,8 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
|
|||
}
|
||||
units := make([]repo_model.RepoUnit, 0, len(defaultUnits))
|
||||
for _, tp := range defaultUnits {
|
||||
if tp == unit.TypeIssues {
|
||||
switch tp {
|
||||
case unit.TypeIssues:
|
||||
units = append(units, repo_model.RepoUnit{
|
||||
RepoID: repo.ID,
|
||||
Type: tp,
|
||||
|
@ -83,7 +84,7 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
|
|||
EnableDependencies: setting.Service.DefaultEnableDependencies,
|
||||
},
|
||||
})
|
||||
} else if tp == unit.TypePullRequests {
|
||||
case unit.TypePullRequests:
|
||||
units = append(units, repo_model.RepoUnit{
|
||||
RepoID: repo.ID,
|
||||
Type: tp,
|
||||
|
@ -94,7 +95,7 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
|
|||
AllowRebaseUpdate: true,
|
||||
},
|
||||
})
|
||||
} else {
|
||||
default:
|
||||
units = append(units, repo_model.RepoUnit{
|
||||
RepoID: repo.ID,
|
||||
Type: tp,
|
||||
|
|
|
@ -42,5 +42,5 @@ func TestGetDirectorySize(t *testing.T) {
|
|||
|
||||
size, err := getDirectorySize(repo.RepoPath())
|
||||
require.NoError(t, err)
|
||||
assert.EqualValues(t, size, repo.Size)
|
||||
assert.Equal(t, size, repo.Size)
|
||||
}
|
||||
|
|
|
@ -14,17 +14,17 @@ func TestMergeCustomLabels(t *testing.T) {
|
|||
all: []string{"a", "a.yaml", "a.yml"},
|
||||
custom: nil,
|
||||
})
|
||||
assert.EqualValues(t, []string{"a.yaml"}, files, "yaml file should win")
|
||||
assert.Equal(t, []string{"a.yaml"}, files, "yaml file should win")
|
||||
|
||||
files = mergeCustomLabelFiles(optionFileList{
|
||||
all: []string{"a", "a.yaml"},
|
||||
custom: []string{"a"},
|
||||
})
|
||||
assert.EqualValues(t, []string{"a"}, files, "custom file should win")
|
||||
assert.Equal(t, []string{"a"}, files, "custom file should win")
|
||||
|
||||
files = mergeCustomLabelFiles(optionFileList{
|
||||
all: []string{"a", "a.yml", "a.yaml"},
|
||||
custom: []string{"a", "a.yml"},
|
||||
})
|
||||
assert.EqualValues(t, []string{"a.yml"}, files, "custom yml file should win if no yaml")
|
||||
assert.Equal(t, []string{"a.yml"}, files, "custom yml file should win if no yaml")
|
||||
}
|
||||
|
|
|
@ -99,7 +99,8 @@ func getLicensePlaceholder(name string) *licensePlaceholder {
|
|||
|
||||
// Some special placeholders for specific licenses.
|
||||
// It's unsafe to apply them to all licenses.
|
||||
if name == "0BSD" {
|
||||
switch name {
|
||||
case "0BSD":
|
||||
return &licensePlaceholder{
|
||||
Owner: []string{"AUTHOR"},
|
||||
Email: []string{"EMAIL"},
|
||||
|
@ -108,7 +109,7 @@ func getLicensePlaceholder(name string) *licensePlaceholder {
|
|||
}
|
||||
|
||||
// Other special placeholders can be added here.
|
||||
} else if name == "BSD-4-Clause" {
|
||||
case "BSD-4-Clause":
|
||||
ret.Owner = append(ret.Owner, "COPYRIGHT HOLDER")
|
||||
ret.Owner = append(ret.Owner, "the organization")
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ func Test_calcSync(t *testing.T) {
|
|||
|
||||
inserts, deletes, updates := calcSync(gitTags, dbReleases)
|
||||
if assert.Len(t, inserts, 1, "inserts") {
|
||||
assert.EqualValues(t, *gitTags[2], *inserts[0], "inserts equal")
|
||||
assert.Equal(t, *gitTags[2], *inserts[0], "inserts equal")
|
||||
}
|
||||
|
||||
if assert.Len(t, deletes, 1, "deletes") {
|
||||
|
@ -71,6 +71,6 @@ func Test_calcSync(t *testing.T) {
|
|||
}
|
||||
|
||||
if assert.Len(t, updates, 1, "updates") {
|
||||
assert.EqualValues(t, *gitTags[1], *updates[0], "updates equal")
|
||||
assert.Equal(t, *gitTags[1], *updates[0], "updates equal")
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue