Skip to content

Add support for action artifact serve direct #29120

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

Merged
merged 4 commits into from
Feb 15, 2024
Merged

Add support for action artifact serve direct #29120

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f21655
Add support for serve direct.
KN4CK3R Feb 9, 2024
bebc043
Fallback to local download url.
KN4CK3R Feb 11, 2024
ea60858
Merge branch 'main' of https://github.com/go-gitea/gitea into enhance…
KN4CK3R Feb 12, 2024
b1306da
Merge branch 'main' into enhancement-29093
GiteaBot Feb 15, 2024
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
15 changes: 14 additions & 1 deletion routers/api/actions/artifacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ package actions

import (
"crypto/md5"
"errors"
"fmt"
"net/http"
"strconv"
Expand Down Expand Up @@ -426,7 +427,19 @@ func (ar artifactRoutes) getDownloadArtifactURL(ctx *ArtifactContext) {

var items []downloadArtifactResponseItem
for _, artifact := range artifacts {
downloadURL := ar.buildArtifactURL(runID, strconv.FormatInt(artifact.ID, 10), "download")
var downloadURL string
if setting.Actions.ArtifactStorage.MinioConfig.ServeDirect {
u, err := ar.fs.URL(artifact.StoragePath, artifact.ArtifactName)
if err != nil && !errors.Is(err, storage.ErrURLNotSupported) {
Copy link
Member

Choose a reason for hiding this comment

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

If it's ErrURLNotSupported, we should fallback to ar.buildArtifactURL ?

log.Error("Error getting serve direct url: %v", err)
}
if u != nil {
downloadURL = u.String()
}
}
if downloadURL == "" {
downloadURL = ar.buildArtifactURL(runID, strconv.FormatInt(artifact.ID, 10), "download")
}
item := downloadArtifactResponseItem{
Path: util.PathJoinRel(itemPath, artifact.ArtifactPath),
ItemType: "file",
Expand Down