diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index caa1a4b..3db5263 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -42,7 +42,7 @@ jobs: - name: Build run: | version=$(git describe --tags --abbrev=7) - go build -ldflags="-X 'github.com/SneaksAndData/snd-cli-go/blob/main/cmd/snd-cli/snd_cli_go.version=$version'" -o snd-${{ matrix.os }}-${{ matrix.arch }} ./cmd/snd-cli + go build -ldflags="-X 'snd-cli/cmd.Version=$version'" -o snd-${{ matrix.os }}-${{ matrix.arch }} ./cmd/snd-cli - name: Import Secrets uses: hashicorp/vault-action@v2.7.3 with: diff --git a/cmd/snd-cli/main.go b/cmd/snd-cli/main.go index 60a53bf..4768021 100644 --- a/cmd/snd-cli/main.go +++ b/cmd/snd-cli/main.go @@ -3,14 +3,15 @@ package main import ( "fmt" "os" - snd_cli_go "snd-cli" + "snd-cli/cmd" "snd-cli/pkg/cmd/root" ) func main() { rootCmd, _ := root.NewCmdRoot() - rootCmd.Version = snd_cli_go.Version - rootCmd.SetVersionTemplate(fmt.Sprintf("snd-cli version %s", snd_cli_go.Version)) + rootCmd.Version = cmd.Version + versionTemplate := fmt.Sprintf("snd-cli version %s \n", cmd.Version) + rootCmd.SetVersionTemplate(versionTemplate) err := rootCmd.Execute() if err != nil { fmt.Println("Error: ", err) diff --git a/version.go b/cmd/version.go similarity index 55% rename from version.go rename to cmd/version.go index 555672e..5bf73bb 100644 --- a/version.go +++ b/cmd/version.go @@ -1,3 +1,3 @@ -package snd_cli_go +package cmd var Version = "v0.0.0" diff --git a/pkg/cmd/util/version/version.go b/pkg/cmd/util/version/version.go index 46e3b35..4e1a42d 100644 --- a/pkg/cmd/util/version/version.go +++ b/pkg/cmd/util/version/version.go @@ -4,13 +4,13 @@ import ( "fmt" "golang.org/x/mod/semver" "os/exec" - snd_cli_go "snd-cli" + snd "snd-cli/cmd" "strings" ) const repoURL = "https://github.com/SneaksAndData/snd-cli-go" -var currentVersion = snd_cli_go.Version +var currentVersion = snd.Version func CheckIfNewVersionIsAvailable() error { lastTag, err := getLatestTag(repoURL)