Merge remote-tracking branch 'origin/main' into mtree-tree

goreleaser · Apr 6, 2023 · 99913b1 · 99913b1
2 parents ee3230b + 5d25139
commit 99913b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,13 +29,13 @@ jobs:
   govulncheck:
     uses: caarlos0/meta/.github/workflows/govulncheck.yml@main
     with:
-      go-version: '>=1.20.2'
+      go-version: stable
   semgrep:
     uses: caarlos0/meta/.github/workflows/semgrep.yml@main
   ruleguard:
     uses: caarlos0/meta/.github/workflows/ruleguard.yml@main
     with:
-      go-version: '>=1.20.2'
+      go-version: stable
       args: '-disable largeloopcopy'
   unit-tests:
     strategy:

diff --git a/nfpm_test.go b/nfpm_test.go
@@ -489,10 +489,10 @@ func TestOverrides(t *testing.T) {
 
 type fakePackager struct{}
 
-func (*fakePackager) ConventionalFileName(info *nfpm.Info) string {
+func (*fakePackager) ConventionalFileName(_ *nfpm.Info) string {
 	return ""
 }
 
-func (*fakePackager) Package(info *nfpm.Info, w io.Writer) error {
+func (*fakePackager) Package(_ *nfpm.Info, _ io.Writer) error {
 	return nil
 }
diff --git a/rpm/rpm.go b/rpm/rpm.go
@@ -137,11 +137,7 @@ func (*RPM) Package(info *nfpm.Info, w io.Writer) (err error) {
 		}
 	}
 
-	if err = rpm.Write(w); err != nil {
-		return err
-	}
-
-	return nil
+	return rpm.Write(w)
 }
 
 func addChangeLog(info *nfpm.Info, rpm *rpmpack.RPM) error {