Merge branch 'main' into add-attachments

This commit is contained in:
myrqs 2023-05-04 21:10:01 +08:00
commit a8b2cfa7e9

View file

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
"path"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@ -162,7 +161,7 @@ func uploadFiles(ctx *gha.GitHubContext, c *gitea.Client, owner, repo string, re
} }
for _, attachment := range attachments { for _, attachment := range attachments {
if attachment.Name == path.Base(file) { if attachment.Name == filepath.Base(file) {
if _, err := c.DeleteReleaseAttachment(owner, repo, releaseID, attachment.ID); err != nil { if _, err := c.DeleteReleaseAttachment(owner, repo, releaseID, attachment.ID); err != nil {
f.Close() f.Close()
return fmt.Errorf("failed to delete release attachment %s: %w", file, err) return fmt.Errorf("failed to delete release attachment %s: %w", file, err)
@ -172,7 +171,7 @@ func uploadFiles(ctx *gha.GitHubContext, c *gitea.Client, owner, repo string, re
} }
} }
if _, _, err = c.CreateReleaseAttachment(owner, repo, releaseID, f, path.Base(file)); err != nil { if _, _, err = c.CreateReleaseAttachment(owner, repo, releaseID, f, filepath.Base(file)); err != nil {
f.Close() f.Close()
return fmt.Errorf("failed to upload release attachment %s: %w", file, err) return fmt.Errorf("failed to upload release attachment %s: %w", file, err)
} }