Merge main into better-http-errors.

github · Jun 14, 2022 · 3fd082e · 3fd082e
2 parents c4a0514 + d451bb4
commit 3fd082e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch: {}
 
 jobs:
   build:

diff --git a/internal/push/push.go b/internal/push/push.go
@@ -325,15 +325,15 @@ func (pushService *pushService) createOrUpdateReleaseAsset(release *github.Repos
 	}
 	log.Debugf("Uploading release asset %s...", assetPathStat.Name())
 	assetFile, err := os.Open(pushService.cacheDirectory.AssetPath(release.GetTagName(), assetPathStat.Name()))
+	if err != nil {
+		return errors.Wrap(err, "Error opening release asset.")
+	}
 	defer assetFile.Close()
 	progressReader := &ioprogress.Reader{
 		Reader:   assetFile,
 		Size:     assetPathStat.Size(),
 		DrawFunc: ioprogress.DrawTerminalf(os.Stderr, ioprogress.DrawTextFormatBytes),
 	}
-	if err != nil {
-		return errors.Wrap(err, "Error opening release asset.")
-	}
 	_, response, err := pushService.uploadReleaseAsset(release, assetPathStat, progressReader)
 	if err != nil {
 		return githubapiutil.EnrichResponseError(response, err, "Error uploading release asset.")
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
       pull_request:
         branches:
           - main
+      workflow_dispatch: {}
     jobs:
       build:
@@ Expand Down @@