From 57b5fb39bbf01882605334e1d51d07af6b9d63cf Mon Sep 17 00:00:00 2001 From: t-oki Date: Wed, 8 Jun 2022 20:26:40 +0900 Subject: [PATCH 1/3] add version file for cli --- VERSION | 1 + sql-migrate/main.go | 4 +++- version.go | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 VERSION create mode 100644 version.go diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..0f1acbd5 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +v1.1.2 diff --git a/sql-migrate/main.go b/sql-migrate/main.go index dbf4ffdc..d15156c5 100644 --- a/sql-migrate/main.go +++ b/sql-migrate/main.go @@ -1,10 +1,12 @@ package main import ( + _ "embed" "fmt" "os" "github.com/mitchellh/cli" + migrate "github.com/rubenv/sql-migrate" ) func main() { @@ -39,7 +41,7 @@ func realMain() int { }, }, HelpFunc: cli.BasicHelpFunc("sql-migrate"), - Version: "1.0.0", + Version: migrate.GetVersion(), } exitCode, err := cli.Run() diff --git a/version.go b/version.go new file mode 100644 index 00000000..b4737026 --- /dev/null +++ b/version.go @@ -0,0 +1,13 @@ +package migrate + +import ( + _ "embed" +) + +//go:embed VERSION +var version string + +// GetVersion returns version depending on the VERSION file +func GetVersion() string { + return version +} From 6923345ba642116bc5cceedbe7815d0537ffd8fa Mon Sep 17 00:00:00 2001 From: t-oki Date: Wed, 8 Jun 2022 21:57:27 +0900 Subject: [PATCH 2/3] use runtime/debug --- VERSION | 1 - sql-migrate/config.go | 9 +++++++++ sql-migrate/main.go | 3 +-- version.go | 13 ------------- 4 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 VERSION delete mode 100644 version.go diff --git a/VERSION b/VERSION deleted file mode 100644 index 0f1acbd5..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -v1.1.2 diff --git a/sql-migrate/config.go b/sql-migrate/config.go index 75748713..b092694e 100644 --- a/sql-migrate/config.go +++ b/sql-migrate/config.go @@ -7,6 +7,7 @@ import ( "fmt" "io/ioutil" "os" + "runtime/debug" "github.com/go-gorp/gorp/v3" migrate "github.com/rubenv/sql-migrate" @@ -103,3 +104,11 @@ func GetConnection(env *Environment) (*sql.DB, string, error) { return db, env.Dialect, nil } + +// GetVersion returns the version. +func GetVersion() string { + if buildInfo, ok := debug.ReadBuildInfo(); ok && buildInfo.Main.Version != "(devel)" { + return buildInfo.Main.Version + } + return "dev" +} diff --git a/sql-migrate/main.go b/sql-migrate/main.go index d15156c5..f2ca8cfc 100644 --- a/sql-migrate/main.go +++ b/sql-migrate/main.go @@ -6,7 +6,6 @@ import ( "os" "github.com/mitchellh/cli" - migrate "github.com/rubenv/sql-migrate" ) func main() { @@ -41,7 +40,7 @@ func realMain() int { }, }, HelpFunc: cli.BasicHelpFunc("sql-migrate"), - Version: migrate.GetVersion(), + Version: GetVersion(), } exitCode, err := cli.Run() diff --git a/version.go b/version.go deleted file mode 100644 index b4737026..00000000 --- a/version.go +++ /dev/null @@ -1,13 +0,0 @@ -package migrate - -import ( - _ "embed" -) - -//go:embed VERSION -var version string - -// GetVersion returns version depending on the VERSION file -func GetVersion() string { - return version -} From deb49347bd4cfb42a4e1c1d2da4906b06b9e8f47 Mon Sep 17 00:00:00 2001 From: t-oki Date: Wed, 8 Jun 2022 21:58:09 +0900 Subject: [PATCH 3/3] delete unnecessary import --- sql-migrate/main.go | 1 - 1 file changed, 1 deletion(-) diff --git a/sql-migrate/main.go b/sql-migrate/main.go index f2ca8cfc..ad8248c3 100644 --- a/sql-migrate/main.go +++ b/sql-migrate/main.go @@ -1,7 +1,6 @@ package main import ( - _ "embed" "fmt" "os"