diff --git a/CHANGELOG.md b/CHANGELOG.md index 2146ae3..b7c1b69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # CHANGELOG -## v2.1.0 +## v1.2.0 + +### Refactor + +- project layout ### Added @@ -8,12 +12,6 @@ - validate function - .editconfig file -## v2.0.0 - -### Refactor - -- project layout - ## v1.1.1 ### Fixed diff --git a/Makefile b/Makefile index 004058a..3c93521 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ BASEDIR = $(shell pwd) export GO111MODULE=on APP_NAME=dingtalk -APP_VERSION=2.1.0 +APP_VERSION=1.2.0 IMAGE_NAME="catchzeng/${APP_NAME}:${APP_VERSION}" IMAGE_LATEST="catchzeng/${APP_NAME}:latest" diff --git a/cmd/dingtalk/version.go b/cmd/dingtalk/version.go index 6f31fe8..5dc72ac 100644 --- a/cmd/dingtalk/version.go +++ b/cmd/dingtalk/version.go @@ -1,12 +1,17 @@ package dingtalk import ( - "github.com/CatchZeng/gutils/version" "log" + v "github.com/CatchZeng/gutils/version" "github.com/spf13/cobra" ) +const ( + version = "1.2.0" + buildTime = "2020/09/15" +) + // versionCmd represents the version command var versionCmd = &cobra.Command{ Use: "version", @@ -16,7 +21,7 @@ var versionCmd = &cobra.Command{ } func runVersionCmd(_ *cobra.Command, _ []string) { - v := version.Stringify("2.1.0", "2020/08/21") + v := v.Stringify(version, buildTime) log.Println(v) } diff --git a/cmd/dingtalk/version_test.go b/cmd/dingtalk/version_test.go index 3375080..2734f90 100644 --- a/cmd/dingtalk/version_test.go +++ b/cmd/dingtalk/version_test.go @@ -2,12 +2,13 @@ package dingtalk import ( "bytes" - "github.com/CatchZeng/gutils/version" "log" "os" "strings" "testing" + v "github.com/CatchZeng/gutils/version" + "github.com/spf13/cobra" ) @@ -20,7 +21,7 @@ func Test_runVersionCmd(t *testing.T) { runVersionCmd(&cobra.Command{}, []string{}) got := buf.String() - want := version.Stringify("2.1.0", "2020/08/21") + want := v.Stringify(version, buildTime) if !strings.Contains(got, want) { t.Errorf("runVersionCmd() = %v, want %v", got, want)