From 7e4c4257eba4b3c279cc71d8950a0a17f68f26f9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 16 Oct 2023 21:41:33 +0200 Subject: [PATCH] fix gomod version --- README.md | 4 ++-- app/app.go | 6 +++--- app/commands/changelog.go | 4 ++-- app/commands/commit.go | 4 ++-- app/commands/commitlog.go | 4 ++-- app/commands/commitnotes.go | 2 +- app/commands/config.go | 2 +- app/commands/currentversion.go | 4 ++-- app/commands/nextversion.go | 4 ++-- app/commands/releasenotes.go | 4 ++-- app/commands/tag.go | 4 ++-- app/commands/utils.go | 4 ++-- app/commands/validatecommitmessage.go | 2 +- app/config.go | 2 +- app/config_test.go | 2 +- cmd/git-sv/main.go | 4 ++-- go.mod | 2 +- sv/formatter/formatter.go | 2 +- sv/formatter/formatter_test.go | 4 ++-- templates/templates.go | 2 +- templates/templates_test.go | 2 +- 21 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index c910a6a..6da3a4f 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ If you want to install from source using `go install`, just run: ```Shell # keep in mind that with this, it will compile from source and won't show the version on cli -h. -go install github.com/thegeeklab/git-sv/v2/cmd/git-sv@latest +go install github.com/thegeeklab/git-sv/cmd/git-sv@latest # if you want to add the version on the binary, run this command instead. -GITSV_VERSION=$(go list -f '{{ .Version }}' -m github.com/thegeeklab/git-sv/v2@latest | sed 's/v//') && go install --ldflags "-X main.Version=$SGITSV_VERSION" github.com/thegeeklab/git-sv/v2/cmd/git-sv@v$GITSV_VERSION +GITSV_VERSION=$(go list -f '{{ .Version }}' -m github.com/thegeeklab/git-sv/v2@latest | sed 's/v//') && go install --ldflags "-X main.Version=$SGITSV_VERSION" github.com/thegeeklab/git-sv/cmd/git-sv@v$GITSV_VERSION ``` ### Configuration diff --git a/app/app.go b/app/app.go index 78eb37c..92bb78b 100644 --- a/app/app.go +++ b/app/app.go @@ -12,9 +12,9 @@ import ( "time" "github.com/Masterminds/semver/v3" - "github.com/thegeeklab/git-sv/v2/sv" - "github.com/thegeeklab/git-sv/v2/sv/formatter" - "github.com/thegeeklab/git-sv/v2/templates" + "github.com/thegeeklab/git-sv/sv" + "github.com/thegeeklab/git-sv/sv/formatter" + "github.com/thegeeklab/git-sv/templates" ) const ( diff --git a/app/commands/changelog.go b/app/commands/changelog.go index 55ab9ad..b21cbb0 100644 --- a/app/commands/changelog.go +++ b/app/commands/changelog.go @@ -5,8 +5,8 @@ import ( "os" "sort" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/commit.go b/app/commands/commit.go index d7bce5f..7899e0a 100644 --- a/app/commands/commit.go +++ b/app/commands/commit.go @@ -3,8 +3,8 @@ package commands import ( "fmt" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/commitlog.go b/app/commands/commitlog.go index 57ce855..aa2c190 100644 --- a/app/commands/commitlog.go +++ b/app/commands/commitlog.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/commitnotes.go b/app/commands/commitnotes.go index 0706abc..a9edb6e 100644 --- a/app/commands/commitnotes.go +++ b/app/commands/commitnotes.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/thegeeklab/git-sv/v2/app" + "github.com/thegeeklab/git-sv/app" "github.com/urfave/cli/v2" ) diff --git a/app/commands/config.go b/app/commands/config.go index 0fa0bd4..1b382b5 100644 --- a/app/commands/config.go +++ b/app/commands/config.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "github.com/thegeeklab/git-sv/v2/app" + "github.com/thegeeklab/git-sv/app" "github.com/urfave/cli/v2" "gopkg.in/yaml.v3" ) diff --git a/app/commands/currentversion.go b/app/commands/currentversion.go index ae20fc5..22065d0 100644 --- a/app/commands/currentversion.go +++ b/app/commands/currentversion.go @@ -3,8 +3,8 @@ package commands import ( "fmt" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/nextversion.go b/app/commands/nextversion.go index eaaf8b4..cb7d4e4 100644 --- a/app/commands/nextversion.go +++ b/app/commands/nextversion.go @@ -3,8 +3,8 @@ package commands import ( "fmt" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/releasenotes.go b/app/commands/releasenotes.go index 6602569..3c58930 100644 --- a/app/commands/releasenotes.go +++ b/app/commands/releasenotes.go @@ -6,8 +6,8 @@ import ( "time" "github.com/Masterminds/semver/v3" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/tag.go b/app/commands/tag.go index 0213a18..75b0339 100644 --- a/app/commands/tag.go +++ b/app/commands/tag.go @@ -3,8 +3,8 @@ package commands import ( "fmt" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" "github.com/urfave/cli/v2" ) diff --git a/app/commands/utils.go b/app/commands/utils.go index 8792e65..6847925 100644 --- a/app/commands/utils.go +++ b/app/commands/utils.go @@ -8,8 +8,8 @@ import ( "time" "github.com/Masterminds/semver/v3" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/sv" ) func getTagCommits(gsv app.GitSV, tag string) ([]sv.CommitLog, error) { diff --git a/app/commands/validatecommitmessage.go b/app/commands/validatecommitmessage.go index 573d710..8b6e580 100644 --- a/app/commands/validatecommitmessage.go +++ b/app/commands/validatecommitmessage.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/rs/zerolog/log" - "github.com/thegeeklab/git-sv/v2/app" + "github.com/thegeeklab/git-sv/app" "github.com/urfave/cli/v2" ) diff --git a/app/config.go b/app/config.go index ee428c8..6ec53b7 100644 --- a/app/config.go +++ b/app/config.go @@ -8,7 +8,7 @@ import ( "dario.cat/mergo" "github.com/rs/zerolog/log" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/sv" "gopkg.in/yaml.v3" ) diff --git a/app/config_test.go b/app/config_test.go index cbd45d8..b899d8b 100644 --- a/app/config_test.go +++ b/app/config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/sv" ) func Test_merge(t *testing.T) { diff --git a/cmd/git-sv/main.go b/cmd/git-sv/main.go index 10bbdb5..c400aaf 100644 --- a/cmd/git-sv/main.go +++ b/cmd/git-sv/main.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/thegeeklab/git-sv/v2/app" - "github.com/thegeeklab/git-sv/v2/app/commands" + "github.com/thegeeklab/git-sv/app" + "github.com/thegeeklab/git-sv/app/commands" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 8dd4e95..7dd3adf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/thegeeklab/git-sv/v2 +module github.com/thegeeklab/git-sv go 1.19 diff --git a/sv/formatter/formatter.go b/sv/formatter/formatter.go index a94244a..3514c78 100644 --- a/sv/formatter/formatter.go +++ b/sv/formatter/formatter.go @@ -7,7 +7,7 @@ import ( "time" "github.com/Masterminds/semver/v3" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/sv" ) type releaseNoteTemplateVariables struct { diff --git a/sv/formatter/formatter_test.go b/sv/formatter/formatter_test.go index 3ace5f5..ecffc46 100644 --- a/sv/formatter/formatter_test.go +++ b/sv/formatter/formatter_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/Masterminds/semver/v3" - "github.com/thegeeklab/git-sv/v2/sv" - "github.com/thegeeklab/git-sv/v2/templates" + "github.com/thegeeklab/git-sv/sv" + "github.com/thegeeklab/git-sv/templates" ) var tmpls = templates.New("") diff --git a/templates/templates.go b/templates/templates.go index 262e8a3..d2db6ab 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -9,7 +9,7 @@ import ( "github.com/Masterminds/sprig/v3" "github.com/rs/zerolog/log" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/sv" ) //go:embed assets diff --git a/templates/templates_test.go b/templates/templates_test.go index 434bf53..f76d4b7 100644 --- a/templates/templates_test.go +++ b/templates/templates_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/thegeeklab/git-sv/v2/sv" + "github.com/thegeeklab/git-sv/sv" ) func Test_checkTemplatesFiles(t *testing.T) {