Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Upgrade xz to v0.5.15 #35377

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.

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

Merged
lunny merged 3 commits into go-gitea:main from lunny:lunny/upgrade_xz
Aug 29, 2025
Merged

Upgrade xz to v0.5.15 #35377

lunny merged 3 commits into go-gitea:main from lunny:lunny/upgrade_xz
Aug 29, 2025

Conversation

Copy link
Member

@lunny lunny commented Aug 29, 2025

No description provided.

@lunny lunny added type/bug topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! backport/v1.24 This PR should be backported to Gitea 1.24 labels Aug 29, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 29, 2025
@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 Aug 29, 2025
Copy link
Member

silverwind commented Aug 29, 2025
edited
Loading

Doesn't seem to work on 32 bit as per CI, maybe we should drop 32 bit build?

Copy link
Member

silverwind commented Aug 29, 2025
edited
Loading

It was fixed already. Need to upgrade it again as per ulikunitz/xz#62.

@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 Aug 29, 2025
@lunny lunny changed the title (削除) Upgrade xz to v0.5.14 (削除ここまで) (追記) Upgrade xz to v0.5.15 (追記ここまで) Aug 29, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 29, 2025
@lunny lunny enabled auto-merge (squash) August 29, 2025 17:17
Copy link
Contributor

wxiaoguang commented Aug 29, 2025
edited
Loading

By the way, maybe it's the time to upgrade all dependencies since 1.25 has reached its release deadline. (good in this PR, or can be in next PR)

lunny reacted with thumbs up emoji

@lunny lunny merged commit 0c6326e into go-gitea:main Aug 29, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Aug 29, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 29, 2025
@lunny lunny deleted the lunny/upgrade_xz branch August 29, 2025 18:01
Copy link
Member Author

lunny commented Aug 29, 2025

lunny/upgrade_xz

It's better to another PR since this one should be backport to v1.24

Copy link
Contributor

wxiaoguang commented Aug 29, 2025
edited
Loading

lunny/upgrade_xz

It's better to another PR since this one should be backport to v1.24

It's not that nice like you imagine.

Most dependency upgrades conflict with other branches. So this PR is highly likely unable to be backported automatically. So you still need to manually backport it, then open a new PR to upgrade other dependencies, then you spend more time on 3 PRs.

If you upgrade all dependncies for 1.25, and upgrade xz for 1.24, then only 2 PRs, it saves your time.

lunny reacted with thumbs up emoji

Copy link
Member Author

lunny commented Aug 29, 2025

Copy link
Collaborator

I was unable to create a backport for 1.24. @lunny, please send one manually. 🍵

go run ./contrib/backport 35377
... // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Aug 30, 2025
@lunny lunny added the backport/done All backports for this PR have been created label Aug 30, 2025
lunny added a commit that referenced this pull request Aug 30, 2025
hiifong added a commit to hiifong/gitea that referenced this pull request Aug 31, 2025
* main: (34 commits)
 when sorting issues by nearest due date, issues without due date should be sorted ascending (go-gitea#35267)
 [skip ci] Updated translations via Crowdin
 Upgrade xz to v0.5.15 (go-gitea#35377)
 Refactor db package (go-gitea#35380)
 Remove the duplicated function GetTags (go-gitea#35375)
 [skip ci] Updated translations via Crowdin
 Allow foreachref parser to grow its buffer (go-gitea#35365)
 Remove global context from db package (go-gitea#35371)
 Use gitrepo.SetDefaultBranch when set default branch of wiki repository (go-gitea#33911)
 Deleting branch could delete broken branch which has database record but git branch is missing (go-gitea#35360)
 Remove incorrect "db.DefaultContext" usages (go-gitea#35366)
 Refactor to use reflect.TypeFor (go-gitea#35370)
 [skip ci] Updated translations via Crowdin
 Remove wrong "git.DefaultContext" (go-gitea#35364)
 Fix context usages (go-gitea#35348)
 Instance signing rule `pubkey` should allow all public keys, not just GPG (go-gitea#35357)
 Allow deleting comment with content via API like web did (go-gitea#35346)
 Prevent duplicate actions email (go-gitea#35215)
 rename nightly docker tag for main branch (go-gitea#35344)
 Fix atom/rss mixed error (go-gitea#35345)
 ...
# Conflicts:
#	tests/integration/pull_merge_test.go
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 1, 2025
* giteaofficial/main:
 [skip ci] Updated translations via Crowdin
 when sorting issues by nearest due date, issues without due date should be sorted ascending (go-gitea#35267)
 [skip ci] Updated translations via Crowdin
 Upgrade xz to v0.5.15 (go-gitea#35377)
 Refactor db package (go-gitea#35380)
 Remove the duplicated function GetTags (go-gitea#35375)
 [skip ci] Updated translations via Crowdin
 Allow foreachref parser to grow its buffer (go-gitea#35365)
 Remove global context from db package (go-gitea#35371)
 Use gitrepo.SetDefaultBranch when set default branch of wiki repository (go-gitea#33911)
 Deleting branch could delete broken branch which has database record but git branch is missing (go-gitea#35360)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lafriks lafriks lafriks approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! type/bug
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /