Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .github/workflows/tag.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions cmd/info/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func showVersion(writer io.Writer) {
styles.PrintWarning(writer, fmt.Sprintf("Could not read workspace version: %v", err))
fmt.Fprintf(writer, "%s\n", styles.Title().Render("Versions"))
t := styles.Table().Rows(
[]string{"ws-cli", Version},
[]string{"ws-cli", Version()},
)
fmt.Fprintln(writer, t.Render())
return
Expand All @@ -26,7 +26,7 @@ func showVersion(writer io.Writer) {

t := styles.Table().Rows(
[]string{"workspace", manifest.Version},
[]string{"ws-cli", Version},
[]string{"ws-cli", Version()},
[]string{"VSCode", manifest.VSCode.Version},
)

Expand All @@ -47,7 +47,7 @@ var showVersionCmd = &cobra.Command{
if all, _ := cmd.Flags().GetBool("all"); all {
showVersion(cmd.OutOrStdout())
} else {
fmt.Fprintln(cmd.OutOrStdout(), Version)
fmt.Fprintln(cmd.OutOrStdout(), Version())
}
},
}
Expand Down
18 changes: 17 additions & 1 deletion cmd/info/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
package info

var Version = "0.0.69"
import "runtime/debug"

func Version() string {
if build, ok := debug.ReadBuildInfo(); ok {
return resolveVersion(build.Main.Version)
}

return resolveVersion("")
}

func resolveVersion(v string) string {
if v == "" || v == "(devel)" {
return "(devel)"
}

return v
}
36 changes: 36 additions & 0 deletions cmd/info/version_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package info

import (
"bytes"
"testing"

"gotest.tools/v3/assert"
)

func TestResolveVersion(t *testing.T) {
tests := []struct {
name string
in string
want string
}{
{"empty", "", "(devel)"},
{"devel", "(devel)", "(devel)"},
{"semver", "v1.2.3", "v1.2.3"},
{"pseudo", "v0.0.0-20260101000000-abcdef123456", "v0.0.0-20260101000000-abcdef123456"},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, resolveVersion(tt.in), tt.want)
})
}
}

func TestShowVersionRendersResolvedVersionVerbatim(t *testing.T) {
buf := &bytes.Buffer{}
showVersionCmd.SetOut(buf)

showVersionCmd.Run(showVersionCmd, []string{})

assert.Equal(t, buf.String(), Version()+"\n")
}
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var rootCmd = &cobra.Command{
Use: "ws-cli",
Short: "âš¡ CLI companion to charge the workspace batteries",
Long: "The workspace command-line companion. Groups helpers for inspecting the running workspace, managing settings and secrets, driving the editor, and serving local assets — most are called by the startup scripts, all are yours in the terminal.",
Version: "v" + info.Version,
Version: info.Version(),
Aliases: []string{"ws"},
SilenceErrors: true,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
Expand All @@ -42,7 +42,7 @@ func Execute() {

fangOptions := []fang.Option{
fang.WithColorSchemeFunc(styles.FrappeColorScheme),
fang.WithVersion(info.Version),
fang.WithVersion(info.Version()),
fang.WithoutManpage(),
}

Expand Down
Loading