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

Fix/upload artifact error windows #27802

Merged
merged 9 commits into from
Oct 30, 2023
Merged

Fix/upload artifact error windows #27802

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e0ac63
fix: parse windows slash '\' query escaped in uploading request 'item…
fuxiaohei Oct 26, 2023
9428292
Merge branch 'main' into fix/upload-artifact-error-windows
fuxiaohei Oct 26, 2023
69666b0
fix: windows slash case when uploading artifact chunk
fuxiaohei Oct 27, 2023
8c7b01a
Update routers/api/actions/artifacts_utils.go
wxiaoguang Oct 28, 2023
4e70a23
Update artifacts_utils.go
wxiaoguang Oct 28, 2023
79e5bf1
Merge branch 'main' into fix/upload-artifact-error-windows
GiteaBot Oct 30, 2023
c838bc9
Merge branch 'main' into fix/upload-artifact-error-windows
GiteaBot Oct 30, 2023
e9f3fef
Merge branch 'main' into fix/upload-artifact-error-windows
GiteaBot Oct 30, 2023
903fcac
Merge branch 'main' into fix/upload-artifact-error-windows
GiteaBot Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions routers/api/actions/artifacts_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

"code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
)

const (
Expand Down Expand Up @@ -58,7 +57,8 @@
func parseArtifactItemPath(ctx *ArtifactContext) (string, string, bool) {
// itemPath is generated from upload-artifact action
// it's formatted as {artifact_name}/{artfict_path_in_runner}
itemPath := util.PathJoinRel(ctx.Req.URL.Query().Get("itemPath"))
// act_runner in host mode on Windows, itemPath is joined by Windows slash '\'
itemPath := util.PathJoinRelX(ctx.Req.URL.Query().Get("itemPath"))

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / lint-go-windows 

undefined: util (typecheck)

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / lint-go-windows 

undefined: util) (typecheck)

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / lint-backend 

undefined: util (typecheck)

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / lint-backend 

undefined: util) (typecheck)

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / checks-backend 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / lint-go-gogit 

undefined: util (typecheck)

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / lint-go-gogit 

undefined: util) (typecheck)

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / backend 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / test-e2e 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / test-mysql 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / test-mssql 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / test-pgsql 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / test-sqlite 

undefined: util

Check failure on line 61 in routers/api/actions/artifacts_utils.go

View workflow job for this annotation

GitHub Actions / test-unit 

undefined: util
artifactName := strings.Split(itemPath, "/")[0]
artifactPath := strings.TrimPrefix(itemPath, artifactName+"/")
if !validateArtifactHash(ctx, artifactName) {
Expand Down
Loading