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

fix artifact merging chunks path with correct slash on Windows #26400

Merged
merged 2 commits into from
Aug 8, 2023
Merged

fix artifact merging chunks path with correct slash on Windows #26400

merged 2 commits into from
Aug 8, 2023

Conversation

fuxiaohei
Copy link
Contributor

From Discord https://discord.com/channels/322538954119184384/1069795723178160168/1136719889684500480

Artifact chunks merging is break on Windows.

Gitea Log:
2023/08/03 20:51:15 ...actions/artifacts.go:271:comfirmUploadArtifact() [E] Error merge chunks: parse content range error: input does not match format

Artifact uses wrong slash to parse saved chunks path.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 8, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 8, 2023
@fuxiaohei fuxiaohei changed the title fix artifact merging chunks path with correct slash fix artifact merging chunks path with correct slash on Windows Aug 8, 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 Aug 8, 2023
@lunny lunny added the type/bug label Aug 8, 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 Aug 8, 2023
@silverwind silverwind added the backport/v1.20 This PR should be backported to Gitea 1.20 label Aug 8, 2023
@silverwind silverwind enabled auto-merge (squash) August 8, 2023 16:51
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 8, 2023
@silverwind silverwind merged commit ad69f71 into go-gitea:main Aug 8, 2023
23 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Aug 8, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Aug 8, 2023

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

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

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Aug 8, 2023
@lunny
Copy link
Member

lunny commented Aug 9, 2023

Maybe we don't need backport

zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 9, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
b842d2a 
* upstream/main:
  [skip ci] Updated translations via Crowdin
  fix artifact merging chunks path with correct slash on Windows (go-gitea#26400)
  Use flex classes in package settings (go-gitea#26314)
  Improve multiple strings in en-US locale (go-gitea#26213)
  Refactor "editorconfig" (go-gitea#26391)
  fix generated source URL on rendered files (go-gitea#26364)
  Remove unnecessary template helper DisableGravatar (go-gitea#26386)
@silverwind
Copy link
Member

Patch does not apply because the file was moved:

gitea/routers/api/actions/artifacts.go

Line 380 in dbabdf6

if _, err := fmt.Sscanf(path, storageDir+"/%d-%d-%d.chunk", &item.ArtifactID, &item.Start, &item.End); err != nil {

Ideally we should backport this.

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@a1012112796 a1012112796 a1012112796 approved these changes

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
6 participants
@fuxiaohei @GiteaBot @lunny @silverwind @a1012112796 @yardenshoham