mirror of
https://github.com/go-gitea/gitea
synced 2024-09-10 16:37:55 +02:00
Lock gofumpt to v0.3.0 and run it (#18866)
We can't depend on `latest` version of gofumpt because the output will not be stable across versions. Lock it down to the latest version released yesterday and run it again.
This commit is contained in:
parent
2b5e013430
commit
2b9df564b8
4
Makefile
4
Makefile
@ -235,7 +235,7 @@ clean:
|
|||||||
.PHONY: fmt
|
.PHONY: fmt
|
||||||
fmt:
|
fmt:
|
||||||
@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GO) install mvdan.cc/gofumpt@latest; \
|
$(GO) install mvdan.cc/gofumpt@v0.3.0; \
|
||||||
fi
|
fi
|
||||||
@echo "Running gitea-fmt (with gofumpt)..."
|
@echo "Running gitea-fmt (with gofumpt)..."
|
||||||
@$(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
|
@$(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
|
||||||
@ -287,7 +287,7 @@ errcheck:
|
|||||||
.PHONY: fmt-check
|
.PHONY: fmt-check
|
||||||
fmt-check:
|
fmt-check:
|
||||||
@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GO) install mvdan.cc/gofumpt@latest; \
|
$(GO) install mvdan.cc/gofumpt@0.3.0; \
|
||||||
fi
|
fi
|
||||||
# get all go files and run gitea-fmt (with gofmt) on them
|
# get all go files and run gitea-fmt (with gofmt) on them
|
||||||
@diff=$$($(GO) run build/code-batch-process.go gitea-fmt -l '{file-list}'); \
|
@diff=$$($(GO) run build/code-batch-process.go gitea-fmt -l '{file-list}'); \
|
||||||
|
@ -195,7 +195,8 @@ func (issue *Issue) updateCrossReferenceList(list []*crossReference, xref *cross
|
|||||||
|
|
||||||
// verifyReferencedIssue will check if the referenced issue exists, and whether the doer has permission to do what
|
// verifyReferencedIssue will check if the referenced issue exists, and whether the doer has permission to do what
|
||||||
func (issue *Issue) verifyReferencedIssue(stdCtx context.Context, ctx *crossReferencesContext, repo *repo_model.Repository,
|
func (issue *Issue) verifyReferencedIssue(stdCtx context.Context, ctx *crossReferencesContext, repo *repo_model.Repository,
|
||||||
ref references.IssueReference) (*Issue, references.XRefAction, error) {
|
ref references.IssueReference,
|
||||||
|
) (*Issue, references.XRefAction, error) {
|
||||||
refIssue := &Issue{RepoID: repo.ID, Index: ref.Index}
|
refIssue := &Issue{RepoID: repo.ID, Index: ref.Index}
|
||||||
refAction := ref.Action
|
refAction := ref.Action
|
||||||
e := db.GetEngine(stdCtx)
|
e := db.GetEngine(stdCtx)
|
||||||
|
@ -11,8 +11,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/timeutil"
|
"code.gitea.io/gitea/modules/timeutil"
|
||||||
"github.com/tstranex/u2f"
|
|
||||||
|
|
||||||
|
"github.com/tstranex/u2f"
|
||||||
"xorm.io/xorm"
|
"xorm.io/xorm"
|
||||||
"xorm.io/xorm/schemas"
|
"xorm.io/xorm/schemas"
|
||||||
)
|
)
|
||||||
|
@ -8,6 +8,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/timeutil"
|
"code.gitea.io/gitea/modules/timeutil"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"xorm.io/xorm/schemas"
|
"xorm.io/xorm/schemas"
|
||||||
)
|
)
|
||||||
|
@ -182,7 +182,8 @@ func NewBleveIndexer(indexDir string) (*BleveIndexer, bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (b *BleveIndexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserError, batchReader *bufio.Reader, commitSha string,
|
func (b *BleveIndexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserError, batchReader *bufio.Reader, commitSha string,
|
||||||
update fileUpdate, repo *repo_model.Repository, batch *gitea_bleve.FlushingBatch) error {
|
update fileUpdate, repo *repo_model.Repository, batch *gitea_bleve.FlushingBatch,
|
||||||
|
) error {
|
||||||
// Ignore vendored files in code search
|
// Ignore vendored files in code search
|
||||||
if setting.Indexer.ExcludeVendored && analyze.IsVendor(update.Filename) {
|
if setting.Indexer.ExcludeVendored && analyze.IsVendor(update.Filename) {
|
||||||
return nil
|
return nil
|
||||||
|
@ -91,7 +91,8 @@ func (a *actionNotifier) NotifyIssueChangeStatus(doer *user_model.User, issue *m
|
|||||||
|
|
||||||
// NotifyCreateIssueComment notifies comment on an issue to notifiers
|
// NotifyCreateIssueComment notifies comment on an issue to notifiers
|
||||||
func (a *actionNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
func (a *actionNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
||||||
issue *models.Issue, comment *models.Comment, mentions []*user_model.User) {
|
issue *models.Issue, comment *models.Comment, mentions []*user_model.User,
|
||||||
|
) {
|
||||||
act := &models.Action{
|
act := &models.Action{
|
||||||
ActUserID: doer.ID,
|
ActUserID: doer.ID,
|
||||||
ActUser: doer,
|
ActUser: doer,
|
||||||
|
@ -30,7 +30,8 @@ func NewNotifier() base.Notifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *indexerNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
func (r *indexerNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
||||||
issue *models.Issue, comment *models.Comment, mentions []*user_model.User) {
|
issue *models.Issue, comment *models.Comment, mentions []*user_model.User,
|
||||||
|
) {
|
||||||
if comment.Type == models.CommentTypeComment {
|
if comment.Type == models.CommentTypeComment {
|
||||||
if issue.Comments == nil {
|
if issue.Comments == nil {
|
||||||
if err := issue.LoadDiscussComments(); err != nil {
|
if err := issue.LoadDiscussComments(); err != nil {
|
||||||
|
@ -29,7 +29,8 @@ func NewNotifier() base.Notifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *mailNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
func (m *mailNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
||||||
issue *models.Issue, comment *models.Comment, mentions []*user_model.User) {
|
issue *models.Issue, comment *models.Comment, mentions []*user_model.User,
|
||||||
|
) {
|
||||||
ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("mailNotifier.NotifyCreateIssueComment Issue[%d] #%d in [%d]", issue.ID, issue.Index, issue.RepoID))
|
ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("mailNotifier.NotifyCreateIssueComment Issue[%d] #%d in [%d]", issue.ID, issue.Index, issue.RepoID))
|
||||||
defer finished()
|
defer finished()
|
||||||
|
|
||||||
|
@ -39,7 +39,8 @@ func NewContext() {
|
|||||||
|
|
||||||
// NotifyCreateIssueComment notifies issue comment related message to notifiers
|
// NotifyCreateIssueComment notifies issue comment related message to notifiers
|
||||||
func NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
func NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
||||||
issue *models.Issue, comment *models.Comment, mentions []*user_model.User) {
|
issue *models.Issue, comment *models.Comment, mentions []*user_model.User,
|
||||||
|
) {
|
||||||
for _, notifier := range notifiers {
|
for _, notifier := range notifiers {
|
||||||
notifier.NotifyCreateIssueComment(doer, repo, issue, comment, mentions)
|
notifier.NotifyCreateIssueComment(doer, repo, issue, comment, mentions)
|
||||||
}
|
}
|
||||||
@ -201,7 +202,8 @@ func NotifyIssueChangeRef(doer *user_model.User, issue *models.Issue, oldRef str
|
|||||||
|
|
||||||
// NotifyIssueChangeLabels notifies change labels to notifiers
|
// NotifyIssueChangeLabels notifies change labels to notifiers
|
||||||
func NotifyIssueChangeLabels(doer *user_model.User, issue *models.Issue,
|
func NotifyIssueChangeLabels(doer *user_model.User, issue *models.Issue,
|
||||||
addedLabels, removedLabels []*models.Label) {
|
addedLabels, removedLabels []*models.Label,
|
||||||
|
) {
|
||||||
for _, notifier := range notifiers {
|
for _, notifier := range notifiers {
|
||||||
notifier.NotifyIssueChangeLabels(doer, issue, addedLabels, removedLabels)
|
notifier.NotifyIssueChangeLabels(doer, issue, addedLabels, removedLabels)
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,8 @@ func (ns *notificationService) Run() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (ns *notificationService) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
func (ns *notificationService) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
||||||
issue *models.Issue, comment *models.Comment, mentions []*user_model.User) {
|
issue *models.Issue, comment *models.Comment, mentions []*user_model.User,
|
||||||
|
) {
|
||||||
opts := issueNotificationOpts{
|
opts := issueNotificationOpts{
|
||||||
IssueID: issue.ID,
|
IssueID: issue.ID,
|
||||||
NotificationAuthorID: doer.ID,
|
NotificationAuthorID: doer.ID,
|
||||||
|
@ -424,7 +424,8 @@ func (m *webhookNotifier) NotifyUpdateComment(doer *user_model.User, c *models.C
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *webhookNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
func (m *webhookNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository,
|
||||||
issue *models.Issue, comment *models.Comment, mentions []*user_model.User) {
|
issue *models.Issue, comment *models.Comment, mentions []*user_model.User,
|
||||||
|
) {
|
||||||
mode, _ := models.AccessLevel(doer, repo)
|
mode, _ := models.AccessLevel(doer, repo)
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
@ -498,7 +499,8 @@ func (m *webhookNotifier) NotifyDeleteComment(doer *user_model.User, comment *mo
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *webhookNotifier) NotifyIssueChangeLabels(doer *user_model.User, issue *models.Issue,
|
func (m *webhookNotifier) NotifyIssueChangeLabels(doer *user_model.User, issue *models.Issue,
|
||||||
addedLabels, removedLabels []*models.Label) {
|
addedLabels, removedLabels []*models.Label,
|
||||||
|
) {
|
||||||
ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("webhook.NotifyIssueChangeLabels User: %s[%d] Issue[%d] #%d in [%d]", doer.Name, doer.ID, issue.ID, issue.Index, issue.RepoID))
|
ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("webhook.NotifyIssueChangeLabels User: %s[%d] Issue[%d] #%d in [%d]", doer.Name, doer.ID, issue.ID, issue.Index, issue.RepoID))
|
||||||
defer finished()
|
defer finished()
|
||||||
|
|
||||||
|
@ -220,7 +220,6 @@ type GenerateRepoOption struct {
|
|||||||
// CreateBranchRepoOption options when creating a branch in a repository
|
// CreateBranchRepoOption options when creating a branch in a repository
|
||||||
// swagger:model
|
// swagger:model
|
||||||
type CreateBranchRepoOption struct {
|
type CreateBranchRepoOption struct {
|
||||||
|
|
||||||
// Name of the branch to create
|
// Name of the branch to create
|
||||||
//
|
//
|
||||||
// required: true
|
// required: true
|
||||||
|
@ -233,7 +233,8 @@ func loadBranches(ctx *context.Context, skip, limit int) (*Branch, []*Branch, in
|
|||||||
|
|
||||||
func loadOneBranch(ctx *context.Context, rawBranch, defaultBranch *git.Branch, protectedBranches []*models.ProtectedBranch,
|
func loadOneBranch(ctx *context.Context, rawBranch, defaultBranch *git.Branch, protectedBranches []*models.ProtectedBranch,
|
||||||
repoIDToRepo map[int64]*repo_model.Repository,
|
repoIDToRepo map[int64]*repo_model.Repository,
|
||||||
repoIDToGitRepo map[int64]*git.Repository) *Branch {
|
repoIDToGitRepo map[int64]*git.Repository,
|
||||||
|
) *Branch {
|
||||||
log.Trace("loadOneBranch: '%s'", rawBranch.Name)
|
log.Trace("loadOneBranch: '%s'", rawBranch.Name)
|
||||||
|
|
||||||
commit, err := rawBranch.GetCommit()
|
commit, err := rawBranch.GetCommit()
|
||||||
|
@ -427,7 +427,8 @@ func SendIssueAssignedMail(issue *models.Issue, doer *user_model.User, content s
|
|||||||
// actionToTemplate returns the type and name of the action facing the user
|
// actionToTemplate returns the type and name of the action facing the user
|
||||||
// (slightly different from models.ActionType) and the name of the template to use (based on availability)
|
// (slightly different from models.ActionType) and the name of the template to use (based on availability)
|
||||||
func actionToTemplate(issue *models.Issue, actionType models.ActionType,
|
func actionToTemplate(issue *models.Issue, actionType models.ActionType,
|
||||||
commentType models.CommentType, reviewType models.ReviewType) (typeName, name, template string) {
|
commentType models.CommentType, reviewType models.ReviewType,
|
||||||
|
) (typeName, name, template string) {
|
||||||
if issue.IsPull {
|
if issue.IsPull {
|
||||||
typeName = "pull"
|
typeName = "pull"
|
||||||
} else {
|
} else {
|
||||||
|
@ -186,7 +186,8 @@ func CreateNewTag(ctx context.Context, doer *user_model.User, repo *repo_model.R
|
|||||||
// delAttachmentUUIDs accept a slice of attachments' uuids which will be deleted from the release
|
// delAttachmentUUIDs accept a slice of attachments' uuids which will be deleted from the release
|
||||||
// editAttachments accept a map of attachment uuid to new attachment name which will be updated with attachments.
|
// editAttachments accept a map of attachment uuid to new attachment name which will be updated with attachments.
|
||||||
func UpdateRelease(doer *user_model.User, gitRepo *git.Repository, rel *models.Release,
|
func UpdateRelease(doer *user_model.User, gitRepo *git.Repository, rel *models.Release,
|
||||||
addAttachmentUUIDs, delAttachmentUUIDs []string, editAttachments map[string]string) (err error) {
|
addAttachmentUUIDs, delAttachmentUUIDs []string, editAttachments map[string]string,
|
||||||
|
) (err error) {
|
||||||
if rel.ID == 0 {
|
if rel.ID == 0 {
|
||||||
return errors.New("UpdateRelease only accepts an exist release")
|
return errors.New("UpdateRelease only accepts an exist release")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user