Integrate goreleaser (#62)

v-byte-cpu · web-flow · commit 29534c455b84 · 2021-04-30T18:15:53.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 sx
+dist/
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -0,0 +1,27 @@
+gomod:
+  proxy: true
+builds:
+  - env:
+      - CGO_ENABLED=1
+    goos:
+      - linux
+    goarch:
+      - amd64
+    flags:
+      - -trimpath
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}}
+    mod_timestamp: '{{ .CommitTimestamp }}'
+    hooks:
+      post: upx {{.Path}}
+archives:
+  - files:
+      - none*
+checksum:
+  algorithm: sha256
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
diff --git a/command/root.go b/command/root.go
@@ -25,9 +25,8 @@ import (
 )
 
 var rootCmd = &cobra.Command{
-	Use:     "sx",
-	Short:   "Fast, modern, easy-to-use network scanner",
-	Version: "0.1.0",
+	Use:   "sx",
+	Short: "Fast, modern, easy-to-use network scanner",
 	// Parse common flags
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) (err error) {
 		if len(cliInterfaceFlag) > 0 {
@@ -187,7 +186,8 @@ func validatePacketScanStdin() (err error) {
 	return
 }
 
-func Main() {
+func Main(version string) {
+	rootCmd.Version = version
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}
diff --git a/go.sum b/go.sum
@@ -80,7 +80,6 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -172,7 +171,6 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -247,7 +245,6 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
diff --git a/main.go b/main.go
@@ -1,7 +1,25 @@
 package main
 
-import "github.com/v-byte-cpu/sx/command"
+import (
+	"fmt"
+
+	"github.com/v-byte-cpu/sx/command"
+)
+
+// will be injected during release
+var (
+	version = "dev"
+	commit  = ""
+)
 
 func main() {
-	command.Main()
+	command.Main(buildVersion(version, commit))
+}
+
+func buildVersion(version, commit string) string {
+	result := version
+	if commit != "" {
+		result = fmt.Sprintf("%s\ncommit: %s", result, commit)
+	}
+	return result
 }
diff --git a/main_test.go b/main_test.go
@@ -0,0 +1,36 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestBuildVersion(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name     string
+		version  string
+		commit   string
+		expected string
+	}{
+		{
+			name:     "VersionOnly",
+			version:  "0.1.0",
+			expected: "0.1.0",
+		},
+		{
+			name:     "VersionAndCommit",
+			version:  "0.1.0",
+			commit:   "1234567",
+			expected: "0.1.0\ncommit: 1234567",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := buildVersion(tt.version, tt.commit)
+			require.Equal(t, tt.expected, result)
+		})
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,8 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`var rootCmd = &cobra.Command{`
`28`		`- Use: "sx",`
`29`		`- Short: "Fast, modern, easy-to-use network scanner",`
`30`		`- Version: "0.1.0",`
	`28`	`+ Use: "sx",`
	`29`	`+ Short: "Fast, modern, easy-to-use network scanner",`
`31`	`30`	`// Parse common flags`
`32`	`31`	`PersistentPreRunE: func(cmd *cobra.Command, args []string) (err error) {`
`33`	`32`	`if len(cliInterfaceFlag) > 0 {`
`@@ -187,7 +186,8 @@ func validatePacketScanStdin() (err error) {`
`187`	`186`	`return`
`188`	`187`	`}`
`189`	`188`
`190`		`-func Main() {`
	`189`	`+func Main(version string) {`
	`190`	`+ rootCmd.Version = version`
`191`	`191`	`if err := rootCmd.Execute(); err != nil {`
`192`	`192`	`os.Exit(1)`
`193`	`193`	`}`