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 json-iterator to allow compilation with go1.18 #18644

Merged
merged 3 commits into from
Feb 6, 2022
Merged

Update json-iterator to allow compilation with go1.18 #18644

merged 3 commits into from
Feb 6, 2022

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Feb 6, 2022

  • Update json-iterator/go to handle 1.18's new memory model with slices.
  • Don't panic while running gitea with go 1.18

Future proof for 1.18
f1ea5ad 
- Update json-iterator/go to handle 1.18's new memory model with slices.
- Don't panic while running gitea with go 1.18
6543
6543 approved these changes Feb 6, 2022
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

once gitea's minGo==1.18 we can clean up some utils & helpers with generics :D

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 6, 2022
@6543 6543 changed the title Future proof for 1.18 update json-iterator Feb 6, 2022
@6543 6543 added this to the 1.17.0 milestone Feb 6, 2022
@Gusted
Copy link
Contributor Author

Gusted commented Feb 6, 2022

once gitea's minGo==1.18 we can clean up some utils & helpers with generics :D

Given that happens we are on go 1.19, that should be fine and generics has been know for a while and hopefully the golang team has a "effective go generics" guide to do certain things a idiomatic way.

@6543
Copy link
Member

6543 commented Feb 6, 2022

just one example that could use generics: https://github.com/go-gitea/gitea/blob/main/modules/util/paginate.go#L9-L34

@Gusted
Copy link
Contributor Author

Gusted commented Feb 6, 2022

just one example that could use generics: https://github.com/go-gitea/gitea/blob/main/modules/util/paginate.go#L9-L34

That would be one of the more straight-forward cases. But when it comes into advanced generics, it should take a conservative approach 😄

@codecov-commenter

This comment was marked as off-topic.

Sign in to view
@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 Feb 6, 2022
@zeripath zeripath merged commit 9712f7d into go-gitea:main Feb 6, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 8, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
06817b1 
* giteaofficial/main: (28 commits)
  Added auto-save whitespace behavior if it changed manually (go-gitea#15566)
  Support custom ACME provider (go-gitea#18340)
  Refactor i18n, use Locale to provide i18n/translation related functions (go-gitea#18648)
  Only request write when necessary (go-gitea#18657)
  [skip ci] Updated translations via Crowdin
  Add separate SSH_USER config option (go-gitea#17584)
  Be more lenient with label colors (go-gitea#17752)
  remove redundant call to UpdateRepoStats during migration (go-gitea#18591)
  more repo dump/restore tests, including pull requests (go-gitea#18621)
  No longer show the db-downgrade SQL in production (go-gitea#18653)
  Fix the missing i18n key for update checker (go-gitea#18646)
  Update gitea-vet (go-gitea#18640)
  Future proof for 1.18 (go-gitea#18644)
  Add `contrib/upgrade.sh` (go-gitea#18286)
  If rendering has failed due to a net.OpError stop rendering (go-gitea#18642)
  Delete old git.NewCommand() and use it as git.NewCommandContext() (go-gitea#18552)
  Update JS dependencies (go-gitea#18636)
  fix commits_list_small.tmpl (go-gitea#18641)
  Fix `make fmt` and `make fmt-check` (go-gitea#18633)
  Frontport of changelog for v1.16.1 (go-gitea#18615)
  ...
@Gusted Gusted mentioned this pull request Mar 15, 2022
Merged
@Gusted Gusted deleted the future-proof branch March 15, 2022 19:48
Gusted pushed a commit to Gusted/gitea that referenced this pull request Mar 15, 2022
Update json-iterator (go-gitea#18644)
a72ff68 
- Backport go-gitea#18644
@Gusted Gusted added backport/done All backports for this PR have been created backport/v1.16 labels Mar 15, 2022
@Gusted Gusted mentioned this pull request Mar 15, 2022
Merged
techknowlogick pushed a commit that referenced this pull request Mar 15, 2022
Update json-iterator (#18644) (#19100)
9bcbbd4 
- Backport #18644
@zeripath zeripath changed the title update json-iterator Update json-iterator Mar 19, 2022
@zeripath zeripath changed the title Update json-iterator Update json-iterator to allow compilation with go1.18 Mar 19, 2022
zeripath added a commit to zeripath/gitea that referenced this pull request Mar 23, 2022
@zeripath
Changelog for 1.16.5
fb7de1c 
 ## [1.16.5](https://github.com/go-gitea/gitea/releases/tag/1.16.5) - 2022-03-23

* BREAKING
  * Bump to build with go1.18 (go-gitea#19120 et al) (go-gitea#19127)
* SECURITY
  * Prevent redirect to Host (2) (go-gitea#19175) (go-gitea#19186)
  * Try to prevent autolinking of displaynames by email readers (go-gitea#19169) (go-gitea#19183)
  * Clean paths when looking in Storage (go-gitea#19124) (go-gitea#19179)
  * Do not send notification emails to inactive users (go-gitea#19131) (go-gitea#19139)
  * Do not send activation email if manual confirm is set (go-gitea#19119) (go-gitea#19122)
* ENHANCEMENTS
  * Use the new/choose link for New Issue on project page (go-gitea#19172) (go-gitea#19176)
* BUGFIXES
  * Fix compare link in active feeds for new branch (go-gitea#19149) (go-gitea#19185)
  * Redirect .wiki/* ui link to /wiki (go-gitea#18831) (go-gitea#19184)
  * Ensure deploy keys with write access can push (go-gitea#19010) (go-gitea#19182)
  * Ensure that setting.LocalURL always has a trailing slash (go-gitea#19171) (go-gitea#19177)
  * Cleanup protected branches when deleting users & teams (go-gitea#19158) (go-gitea#19174)
  * Use IterateBufferSize whilst querying repositories during adoption check (go-gitea#19140) (go-gitea#19160)
  * Fix NPE /repos/issues/search when not signed in (go-gitea#19154) (go-gitea#19155)
  * Use custom favicon when viewing static files if it exists (go-gitea#19130) (go-gitea#19152)
  * Fix the editor height in review box (go-gitea#19003) (go-gitea#19147)
  * Ensure isSSH is set whenever DISABLE_HTTP_GIT is set (go-gitea#19028) (go-gitea#19146)
  * Fix wrong scopes caused by empty scope input (go-gitea#19029) (go-gitea#19145)
  * Make migrations SKIP_TLS_VERIFY apply to git too (go-gitea#19132) (go-gitea#19141)
  * Handle email address not exist (go-gitea#19089) (go-gitea#19121)
* MISC
  * Update json-iterator to allow compilation with go1.18 (go-gitea#18644) (go-gitea#19100)
  * Update golang.org/x/crypto (go-gitea#19097) (go-gitea#19098)

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Mar 23, 2022
Merged
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
Future proof for 1.18 (go-gitea#18644)
528fd60 
- Update json-iterator/go to handle 1.18's new memory model with slices.
- Don't panic while running gitea with go 1.18
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Gusted @6543 @codecov-commenter @zeripath @GiteaBot