fix: barry quick fix, 2025-07-25 16:49:15

Author: kooksee

cmds/tagcmd/cmd.go

@@ -2,6 +2,7 @@ package tagcmd
 
 import (
 	"context"
+	"os"
 	"strings"
 	"time"
 
@@ -11,16 +12,26 @@ import (
 	"github.com/pubgo/funk/assert"
 	"github.com/pubgo/funk/errors"
 	"github.com/pubgo/funk/recovery"
+	"github.com/samber/lo"
 	"github.com/urfave/cli/v3"
 
 	"github.com/pubgo/fastcommit/cmds/cmdutils"
 	"github.com/pubgo/fastcommit/utils"
 )
 
 func New() *cli.Command {
+	var pushRelease bool
 	return &cli.Command{
 		Name:  "tag",
 		Usage: "gen tag and push origin",
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:        "push",
+				Usage:       "release tag and push remote",
+				Value:       pushRelease,
+				Destination: &pushRelease,
+			},
+		},
 		Action: func(ctx context.Context, command *cli.Command) error {
 			defer recovery.Exit()
 
@@ -56,10 +67,16 @@ func New() *cli.Command {
 			tagName = m1.Value()
 			_, err := semver.NewVersion(tagName)
 			if err != nil {
-				return errors.Format("tag name is not valid: %s", tagName)
+				return errors.Errorf("tag name is not valid: %s", tagName)
+			}
+
+			lo.Must0(os.MkdirAll("version", 0755))
+			lo.Must0(os.WriteFile("version/.version", []byte(tagName), 0644))
+
+			if pushRelease {
+				utils.GitPushTag(tagName)
 			}
 
-			utils.GitPushTag(tagName)
 			return nil
 		},
 	}

cmds/versioncmd/cmd.go

@@ -3,7 +3,7 @@ package versioncmd
 import (
 	"context"
 	"fmt"
-	
+
 	"github.com/pubgo/fastcommit/utils"
 	"github.com/pubgo/funk/recovery"
 	"github.com/pubgo/funk/running"
@@ -17,8 +17,9 @@ func New() *cli.Command {
 		Usage: utils.UsageDesc("%s version info", version.Project()),
 		Action: func(ctx context.Context, command *cli.Command) error {
 			defer recovery.Exit()
+			ver := version.Version()
 			fmt.Println("project:", version.Project())
-			fmt.Println("version:", version.Version())
+			fmt.Println("version:", ver)
 			fmt.Println("commit-id:", version.CommitID())
 			fmt.Println("build-time:", version.BuildTime())
 			fmt.Println("instance-id:", running.InstanceID)

main.go

@@ -1,9 +1,8 @@
 package main
 
 import (
-	"github.com/pubgo/fastcommit/bootstrap"
-
 	_ "github.com/lithammer/fuzzysearch/fuzzy"
+	"github.com/pubgo/fastcommit/bootstrap"
 )
 
 func main() {

utils/git.go

@@ -135,7 +135,7 @@ func GetBranch() result.Result[string] {
 	})
 }
 
-func pushTag(tag string) result.Error {
+func PushTag(tag string) result.Error {
 	shell := fmt.Sprintf("git push origin %s", tag)
 	return result.ErrOf(script.Exec(shell).Error()).Map(func(err error) error {
 		return fmt.Errorf("failed to run shell %q, err=%w", shell, err)

utils/util.go

@@ -40,6 +40,13 @@ func GetAllGitTags() []*semver.Version {
 	return versions
 }
 
+func GetCurMaxVer() *semver.Version {
+	tags := GetAllGitTags()
+	return typex.DoBlock1(func() *semver.Version {
+		return lo.MaxBy(tags, func(a *semver.Version, b *semver.Version) bool { return a.Compare(b) > 0 })
+	})
+}
+
 func GetNextReleaseTag(tags []*semver.Version) *semver.Version {
 	var curMaxVer = typex.DoBlock1(func() *semver.Version {
 		return lo.MaxBy(tags, func(a *semver.Version, b *semver.Version) bool { return a.Compare(b) > 0 })

version/version.go

@@ -0,0 +1,15 @@
+package version
+
+var mainPath string
+
+// git rev-parse HEAD
+// git describe --always --abbrev=7 --dirty
+var (
+	commitID  string
+	buildTime string
+	version   = "v0.0.1-dev-99"
+	project   = "project"
+)
+
+// git describe --tags --abbrev=0
+// git tag --sort=committerdate | tail -n 1