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

Upgrade go dependencies #25819

Merged
merged 20 commits into from
Jul 14, 2023
Merged

Upgrade go dependencies #25819

merged 20 commits into from
Jul 14, 2023

Conversation

harryzcy
Copy link
Contributor

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 11, 2023
@pull-request-size pull-request-size bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 11, 2023
harryzcy
harryzcy commented Jul 11, 2023
View reviewed changes
modules/markup/orgmode/orgmode.go
@@ -51,7 +51,7 @@ func (Renderer) SanitizerRules() []setting.MarkupSanitizerRule {
// Render renders orgmode rawbytes to HTML
func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
htmlWriter := org.NewHTMLWriter()
htmlWriter.HighlightCodeBlock = func(source, lang string, inline bool) string {
htmlWriter.HighlightCodeBlock = func(source, lang string, inline bool, params map[string]string) string {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The function is changed in niklasfasching/go-org@9b56fc9

@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 11, 2023
@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 11, 2023
silverwind
silverwind previously approved these changes Jul 11, 2023
View reviewed changes
@lafriks lafriks enabled auto-merge (squash) July 11, 2023 22:14
auto-merge was automatically disabled July 11, 2023 22:55

Head branch was pushed to by a user without write access

@harryzcy
Copy link
Contributor Author

github.com/hashicorp/golang-lru is upgraded to v2. The only change is it uses generics.

harryzcy
harryzcy commented Jul 11, 2023
View reviewed changes
Copy link
Contributor Author

@harryzcy harryzcy left a comment

Choose a reason for hiding this comment

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

Please help with the review if the changes are correct. The lru cache generics enforce the type, which reveals two potential bugs.

models/auth/token.go Show resolved Hide resolved
modules/cache/cache_twoqueue.go
c.cache.Remove(item)
c.cache.Remove(key)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think key should be used when removing from cache.

@techknowlogick
Copy link
Member

Failure looks to be due to the Action using a (now) outdated version of Go, otherwise this is probably fine to merge once the action sorts itself out. I'll set "wait-merge" label, so that giteabot will keep the branch fresh to until the action is updated.

@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 12, 2023
@silverwind
Copy link
Member

Should work again now that actions/go-versions@e0a0673 is in.

@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 12, 2023
@silverwind silverwind dismissed their stale review July 12, 2023 12:32

Outdated

@silverwind
Copy link
Member

Branch is passing now, we need to check above open questions.

@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 13, 2023
@lunny lunny merged commit c5e187c into go-gitea:main Jul 14, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jul 14, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 14, 2023
@harryzcy harryzcy deleted the upgrade-go-deps branch July 14, 2023 03:22
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 14, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
21d25b9 
* giteaofficial/main:
  Fix incorrect release count (go-gitea#25879)
  Add Github related extensions in devcontainer (go-gitea#25800)
  Add error info if no user can fork the repo (go-gitea#25820)
  Fix wrong usage of PathEscapeSegments in branch list page (go-gitea#25864)
  fix incorrect repo url when changed the case of ownername (go-gitea#25733)
  Upgrade go dependencies (go-gitea#25819)
  Don't stack PR tab menu on small screens (go-gitea#25789)
  Link to list of vulnerabilities (go-gitea#25872)
  [skip ci] Updated translations via Crowdin
  move issue filters to shared template (go-gitea#25729)
  [skip ci] Updated translations via Crowdin
  Remove `git.FileBlame` (go-gitea#25841)
  Fix empty project displayed in issue sidebar (go-gitea#25802)
  Update blog links (go-gitea#25843)
  Fix margin on the `new/edit milestone` page (go-gitea#25801)
  Do not "guess" the file encoding/BOM when using API to upload files (go-gitea#25828)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 12, 2023
@denyskon denyskon added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Nov 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind left review comments

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XL Denotes a PR that changes 500-999 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.
10 participants
@harryzcy @techknowlogick @silverwind @lunny @wxiaoguang @delvh @yardenshoham @GiteaBot @denyskon @lafriks