Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tool dependencies, lock govulncheck and actionlint #25655

Merged
merged 16 commits into from
Jul 9, 2023
Merged

Update tool dependencies, lock govulncheck and actionlint #25655

merged 16 commits into from
Jul 9, 2023

Conversation

silverwind
Copy link
Member

  • Update all tool dependencies
  • Lock govulncheck and actionlint to their latest tags

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 3, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 3, 2023
@silverwind silverwind added dependencies skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.20 This PR should be backported to Gitea 1.20 labels Jul 3, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 3, 2023
@silverwind
Copy link
Member Author

Can try a backport, if it's automatic 😆.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 3, 2023
@silverwind
Copy link
Member Author

silverwind commented Jul 3, 2023 •
edited
Loading

Looks like golangci brought up a few thousand new failures 😵. Any insights welcome.

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 3, 2023
@silverwind
Copy link
Member Author

silverwind commented Jul 3, 2023 •
edited
Loading

Wonder what to do about nakedret, it finds a lot more stuff now.

Replace all affected return with return nil, or disable the linter?

@silverwind

This comment was marked as outdated.

Sign in to view
silverwind
silverwind commented Jul 3, 2023
View reviewed changes
modules/json/json.go Outdated Show resolved Hide resolved
@silverwind
Copy link
Member Author

silverwind commented Jul 4, 2023 •
edited
Loading

We already have set max-func-lines: 0, so I guess I keep that and just fix all the cases then. A shame there is not autofix available from golanci.

@wxiaoguang
Copy link
Contributor

There were some PRs for such fixing, but there was a bug in old nakedret, it didn't find the "return" in "if" at that time.

That's why it finds more now ......

@silverwind
Copy link
Member Author

Ah, that explains the sudden influx of new failures.

@6543
Copy link
Member

6543 commented Jul 4, 2023

#25682

@silverwind
Copy link
Member Author

277 lint errors left.

@6543 6543 removed the backport/v1.20 This PR should be backported to Gitea 1.20 label Jul 5, 2023
@6543 6543 mentioned this pull request Jul 5, 2023
Merged
@6543
Copy link
Member

6543 commented Jul 5, 2023

well next smal pull #25713

we will get there ...

6543 added a commit that referenced this pull request Jul 7, 2023
@6543
Less naked returns (#25713)
8995046 
just a step towards  #25655

and some related refactoring
@silverwind
Copy link
Member Author

113 errors left 👍

@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 8, 2023
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Jul 8, 2023 •
edited
Loading

All done, 0cef69b

Some code like return mode, fname, sha, n, err and return sha, typ, size, err are written as is intentionally, to avoid breaking.

puni9869
puni9869 reviewed Jul 8, 2023
View reviewed changes
models/activities/notification.go
}
if err = n.loadComment(ctx); err != nil {
return
return err
}
return err
Copy link
Member

@puni9869 puni9869 Jul 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker.

https://github.com/go-gitea/gitea/pull/25655/files#diff-a9a3a131e7fcfb1641580afd9381afe56f44022d9a5e4ba651361f9230fa1694L386
what is the need of return err
we can put return nil

Sometime it hard to recall the Named return values in golang.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well we do report the error back so we need to retur err and not nil here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is also a similar case of #25655 (comment)

Some code like return mode, fname, sha, n, err and return sha, typ, size, err are written as is intentionally, to avoid breaking.

The purpose of it is to avoid changing old code too much (which might break something or cause difficulty for reviewing).

In short: In Golang, return err is always right for named return values, but if you want to change it, the developers should always spend more time on thinking about "what value should be returned".

@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 9, 2023
@silverwind silverwind enabled auto-merge (squash) July 9, 2023 11:07
@silverwind silverwind merged commit 887a683 into go-gitea:main Jul 9, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jul 9, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 9, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 10, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
28f689d 
* giteaofficial/main: (31 commits)
  Fix WORK_DIR for docker (root) image (go-gitea#25738)
  Avoid amending the Rebase and Fast-forward merge if there is no message template (go-gitea#25779)
  Show edit title button on commits tab of PR, too (go-gitea#25791)
  Make "install page" respect environment config (go-gitea#25648)
  Enable H014 and H023 djlint rules (go-gitea#25786)
  Restructure issue list template, styles (go-gitea#25750)
  Fix notification list bugs (go-gitea#25781)
  Revert package access change from go-gitea#23879 (go-gitea#25707)
  Make route middleware/handler mockable (go-gitea#25766)
  Update tool dependencies, lock govulncheck and actionlint (go-gitea#25655)
  Test if container blob is accessible before mounting (go-gitea#22759)
  Always pass 6-digit hex color to monaco (go-gitea#25780)
  Fix the wrong default branch name displayed by checkout (go-gitea#25777)
  Tweak repo topics bar (go-gitea#25769)
  docs: rootless docker ssh's default port is 2222 (go-gitea#25771)
  Repository Archived text title center align (go-gitea#25767)
  Update JS dependencies, misc tweaks (go-gitea#25768)
  Clarify "text-align" CSS helpers, fix clone button padding (go-gitea#25763)
  Switch to `vite-string-plugin` (go-gitea#25762)
  Newly pushed branches hints on repository home page (go-gitea#25715)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@puni9869 puni9869 puni9869 left review comments

@6543 6543 6543 approved these changes

@wxiaoguang wxiaoguang wxiaoguang left review comments

@delvh delvh delvh approved these changes

@denyskon denyskon denyskon approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
8 participants
@silverwind @wxiaoguang @6543 @lunny @denyskon @delvh @puni9869 @GiteaBot