Feature non-zipped actions artifacts (action v7 / nodejs / npm v6.2.0)

models/actions/artifact.go

@@ -156,7 +156,7 @@ func (opts FindArtifactsOptions) ToConds() builder.Cond {
 	}
 	if opts.FinalizedArtifactsV4 {
 		cond = cond.And(builder.Eq{"status": ArtifactStatusUploadConfirmed}.Or(builder.Eq{"status": ArtifactStatusExpired}))
-		cond = cond.And(builder.Eq{"content_encoding": "application/zip"})
+		cond = cond.And(builder.Like{"content_encoding", "/"})
 	}
 
 	return cond

modules/actions/artifacts.go

@@ -4,7 +4,10 @@
 package actions
 
 import (
+	"fmt"
 	"net/http"
+	"net/url"
+	"strings"
 
 	actions_model "code.gitea.io/gitea/models/actions"
 	"code.gitea.io/gitea/modules/setting"
@@ -13,13 +16,16 @@ import (
 )
 
 // Artifacts using the v4 backend are stored as a single combined zip file per artifact on the backend
-// The v4 backend ensures ContentEncoding is set to "application/zip", which is not the case for the old backend
+// The v4 backend ensures ContentEncoding contains a slash (otherwise this uses application/zip instead of the custom mime type), which is not the case for the old backend
 func IsArtifactV4(art *actions_model.ActionArtifact) bool {
-	return art.ArtifactName+".zip" == art.ArtifactPath && art.ContentEncoding == "application/zip"
+	return strings.Contains(art.ContentEncoding, "/")
 }
 
 func DownloadArtifactV4ServeDirectOnly(ctx *context.Base, art *actions_model.ActionArtifact) (bool, error) {
 	if setting.Actions.ArtifactStorage.ServeDirect() {
+		reqParams := url.Values{}
+		reqParams.Set("response-content-type", art.ContentEncoding)
+		reqParams.Set("response-content-disposition", fmt.Sprintf("inline; filename=%s; filename*=UTF-8''%s", url.PathEscape(art.ArtifactPath), art.ArtifactPath))
 		u, err := storage.ActionsArtifacts.URL(art.StoragePath, art.ArtifactPath, ctx.Req.Method, nil)
 		if u != nil && err == nil {
 			ctx.Redirect(u.String(), http.StatusFound)
@@ -35,7 +41,8 @@ func DownloadArtifactV4Fallback(ctx *context.Base, art *actions_model.ActionArti
 		return err
 	}
 	defer f.Close()
-	http.ServeContent(ctx.Resp, ctx.Req, art.ArtifactName+".zip", art.CreatedUnix.AsLocalTime(), f)
+	ctx.Resp.Header().Set("Content-Type", art.ContentEncoding)
+	http.ServeContent(ctx.Resp, ctx.Req, art.ArtifactPath, art.CreatedUnix.AsLocalTime(), f)
 	return nil
 }