diff --git a/acceptance_test.go b/acceptance_test.go index c7d8fb9..d083da3 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -1,3 +1,4 @@ +//go:build acceptance // +build acceptance package nfpm_test @@ -9,12 +10,11 @@ import ( "path/filepath" "testing" - "github.com/stretchr/testify/require" - "github.com/goreleaser/nfpm/v2" _ "github.com/goreleaser/nfpm/v2/apk" _ "github.com/goreleaser/nfpm/v2/deb" _ "github.com/goreleaser/nfpm/v2/rpm" + "github.com/stretchr/testify/require" ) // nolint: gochecknoglobals diff --git a/apk/apk_test.go b/apk/apk_test.go index 4454e4e..775b5f1 100644 --- a/apk/apk_test.go +++ b/apk/apk_test.go @@ -14,11 +14,10 @@ import ( "path/filepath" "testing" - "github.com/stretchr/testify/require" - "github.com/goreleaser/nfpm/v2" "github.com/goreleaser/nfpm/v2/files" "github.com/goreleaser/nfpm/v2/internal/sign" + "github.com/stretchr/testify/require" ) // nolint: gochecknoglobals diff --git a/deb/deb.go b/deb/deb.go index 3e1f70b..80f887c 100644 --- a/deb/deb.go +++ b/deb/deb.go @@ -19,11 +19,10 @@ import ( "github.com/blakesmith/ar" "github.com/goreleaser/chglog" - "github.com/ulikunitz/xz" - "github.com/goreleaser/nfpm/v2" "github.com/goreleaser/nfpm/v2/files" "github.com/goreleaser/nfpm/v2/internal/sign" + "github.com/ulikunitz/xz" ) const packagerName = "deb" diff --git a/deb/deb_test.go b/deb/deb_test.go index 8fec9ee..2d8b429 100644 --- a/deb/deb_test.go +++ b/deb/deb_test.go @@ -20,13 +20,12 @@ import ( "github.com/blakesmith/ar" "github.com/goreleaser/chglog" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/xi2/xz" - "github.com/goreleaser/nfpm/v2" "github.com/goreleaser/nfpm/v2/files" "github.com/goreleaser/nfpm/v2/internal/sign" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/xi2/xz" ) // nolint: gochecknoglobals diff --git a/files/files_test.go b/files/files_test.go index 04a288d..4ba7c24 100644 --- a/files/files_test.go +++ b/files/files_test.go @@ -7,10 +7,9 @@ import ( "testing" "time" + "github.com/goreleaser/nfpm/v2/files" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - - "github.com/goreleaser/nfpm/v2/files" ) type testStruct struct { diff --git a/internal/sign/pgp.go b/internal/sign/pgp.go index e1e401e..a7b85dc 100644 --- a/internal/sign/pgp.go +++ b/internal/sign/pgp.go @@ -12,7 +12,6 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" - "github.com/goreleaser/nfpm/v2" ) diff --git a/internal/sign/pgp_test.go b/internal/sign/pgp_test.go index 1d3211a..a9e1a96 100644 --- a/internal/sign/pgp_test.go +++ b/internal/sign/pgp_test.go @@ -9,9 +9,8 @@ import ( "github.com/AlekSi/pointer" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/stretchr/testify/require" - "github.com/goreleaser/nfpm/v2" + "github.com/stretchr/testify/require" ) const pass = "hunter2" diff --git a/nfpm.go b/nfpm.go index 061906c..373d5fb 100644 --- a/nfpm.go +++ b/nfpm.go @@ -11,10 +11,9 @@ import ( "github.com/AlekSi/pointer" "github.com/Masterminds/semver/v3" "github.com/goreleaser/chglog" + "github.com/goreleaser/nfpm/v2/files" "github.com/imdario/mergo" "gopkg.in/yaml.v3" - - "github.com/goreleaser/nfpm/v2/files" ) // nolint: gochecknoglobals diff --git a/nfpm_test.go b/nfpm_test.go index fb1f68d..b2fe8a1 100644 --- a/nfpm_test.go +++ b/nfpm_test.go @@ -8,10 +8,9 @@ import ( "strings" "testing" - "github.com/stretchr/testify/require" - "github.com/goreleaser/nfpm/v2" "github.com/goreleaser/nfpm/v2/files" + "github.com/stretchr/testify/require" ) func TestRegister(t *testing.T) { diff --git a/rpm/rpm.go b/rpm/rpm.go index 4d3a8a2..ccac39e 100644 --- a/rpm/rpm.go +++ b/rpm/rpm.go @@ -13,14 +13,11 @@ import ( "time" "github.com/google/rpmpack" - "github.com/sassoftware/go-rpmutils/cpio" - + "github.com/goreleaser/chglog" + "github.com/goreleaser/nfpm/v2" "github.com/goreleaser/nfpm/v2/files" "github.com/goreleaser/nfpm/v2/internal/sign" - - "github.com/goreleaser/chglog" - - "github.com/goreleaser/nfpm/v2" + "github.com/sassoftware/go-rpmutils/cpio" ) const ( diff --git a/rpm/rpm_test.go b/rpm/rpm_test.go index 1ded46f..cd9a4d1 100644 --- a/rpm/rpm_test.go +++ b/rpm/rpm_test.go @@ -14,14 +14,13 @@ import ( "time" "github.com/goreleaser/chglog" + "github.com/goreleaser/nfpm/v2" + "github.com/goreleaser/nfpm/v2/files" "github.com/sassoftware/go-rpmutils" "github.com/sassoftware/go-rpmutils/cpio" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/crypto/openpgp" - - "github.com/goreleaser/nfpm/v2" - "github.com/goreleaser/nfpm/v2/files" ) func exampleInfo() *nfpm.Info {