temp(internal/releaser): update interface method Uploadassets

internal/releaser/github/github.go

@@ -113,38 +113,21 @@ func (g Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedCh
 }
 
 // UploadAssets uploads specified assets
-func (g Client) UploadAssets(assets []config.Asset) error {
+func (g Client) UploadAssets(repoDir string, assets []config.Asset) error {
-	for _, asset := range assets {
+	filesToUpload, err := util.PrepareAssets(repoDir, assets)
-		if asset.Compress {
+	if err != nil {
-			zipName, err := util.ZipFile(g.config.Repo, asset.Name)
+		return err
+	}
+	for _, f := range filesToUpload {
+
+		file, err := os.Open(*f)
 		if err != nil {
 			return err
 		}
 
-			file, err := os.Open(g.config.Repo + zipName)
+		_, resp, err := g.client.Repositories.UploadReleaseAsset(g.context, g.config.User, g.config.Repo, *g.release.ID, &github.UploadOptions{Name: ""}, file)
-			if err != nil {
-				return err
-			}
-			defer file.Close()
-
-			_, resp, err := g.client.Repositories.UploadReleaseAsset(g.context, g.config.User, g.config.Repo, *g.release.ID, &github.UploadOptions{Name: zipName}, file)
-			if err != nil {
-				return err
-			}
-
-			if resp.StatusCode >= http.StatusBadRequest {
-				return fmt.Errorf("releaser: github: Could not upload asset %s: %s", zipName, resp.Status)
-			}
-
-		} else {
-			file, err := os.Open(asset.Name)
-			if err != nil {
-				return err
-			}
-			defer file.Close()
-
-			_, resp, err := g.client.Repositories.UploadReleaseAsset(g.context, g.config.User, g.config.Repo, *g.release.ID, &github.UploadOptions{Name: file.Name()}, file)
 		if err != nil {
+			log.Debug("lol")
 			return err
 		}
 
@@ -152,6 +135,6 @@ func (g Client) UploadAssets(assets []config.Asset) error {
 			return fmt.Errorf("releaser: github: Could not upload asset %s: %s", file.Name(), resp.Status)
 		}
 	}
-	}
+
 	return nil
 }

internal/releaser/releaser.go

@@ -19,7 +19,7 @@ type Releasers struct {
 type Releaser interface {
 	ValidateConfig() error
 	CreateRelease(*shared.ReleaseVersion, *shared.GeneratedChangelog) error
-	UploadAssets(assets []config.Asset) error
+	UploadAssets(repoDir string, assets []config.Asset) error
 	GetCommitURL() string
 	GetCompareURL(oldVersion, newVersion string) string
 }

pkg/semanticrelease/semantic-release.go

@@ -9,6 +9,7 @@ import (
 	"github.com/Nightapes/go-semantic-release/internal/changelog"
 	"github.com/Nightapes/go-semantic-release/internal/gitutil"
 	"github.com/Nightapes/go-semantic-release/internal/releaser"
+	"github.com/Nightapes/go-semantic-release/internal/releaser/util"
 	"github.com/Nightapes/go-semantic-release/internal/shared"
 	"github.com/Nightapes/go-semantic-release/pkg/config"
 	log "github.com/sirupsen/logrus"
@@ -245,11 +246,21 @@ func (s *SemanticRelease) Release(force bool) error {
 		return err
 	}
 
-	if err = releaser.UploadAssets(s.config.Assets); err != nil {
+	if err = releaser.UploadAssets(s.repository, s.config.Assets); err != nil {
 		return err
 	}
 
 	return nil
 }
 
+// ZipFiles zip files configured in release config
+func (s *SemanticRelease) ZipFiles() error {
+	for _, file := range s.config.Assets {
 		if file.Compress {
+			if _, err := util.PrepareAssets(s.repository, s.config.Assets); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}