Skip to content

Update ls release version automatically using ldflags #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 19, 2022
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
13 changes: 13 additions & 0 deletions globals/globals.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package globals

import (
"os"
"path/filepath"

"github.com/arduino/arduino-language-server/version"
)

var (
// VersionInfo contains all info injected during build
VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
)
4 changes: 3 additions & 1 deletion ls/ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/arduino/arduino-cli/executils"
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/settings/v1"
"github.com/arduino/arduino-language-server/globals"
"github.com/arduino/arduino-language-server/sourcemapper"
"github.com/arduino/arduino-language-server/streams"
"github.com/arduino/go-paths-helper"
Expand Down Expand Up @@ -139,6 +140,7 @@ func NewINOLanguageServer(stdin io.Reader, stdout io.Writer, config *Config) *IN
}

logger.Logf("Initial board configuration: %s", ls.config.Fqbn)
logger.Logf("%s", globals.VersionInfo.String())
logger.Logf("Language server build path: %s", ls.buildPath)
logger.Logf("Language server build sketch root: %s", ls.buildSketchRoot)
logger.Logf("Language server FULL build path: %s", ls.fullBuildPath)
Expand Down Expand Up @@ -356,7 +358,7 @@ func (ls *INOLanguageServer) initializeReqFromIDE(ctx context.Context, logger js
},
ServerInfo: &lsp.InitializeResultServerInfo{
Name: "arduino-language-server",
Version: "0.7.2",
Version: globals.VersionInfo.VersionString,
},
}
logger.Logf("initialization parameters: %s", string(lsp.EncodeMessage(resp)))
Expand Down
39 changes: 39 additions & 0 deletions version/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package version

import "fmt"

var (
defaultVersionString = "0.0.0-git"
versionString = ""
commit = ""
date = ""
)

// Info is a struct that contains informations about the application
type Info struct {
Application string `json:"Application"`
VersionString string `json:"VersionString"`
Commit string `json:"Commit"`
Date string `json:"Date"`
}

// NewInfo returns a pointer to an updated Info struct
func NewInfo(application string) *Info {
return &Info{
Application: application,
VersionString: versionString,
Commit: commit,
Date: date,
}
}

func (i *Info) String() string {
return fmt.Sprintf("%[1]s Version: %[2]s Commit: %[3]s Date: %[4]s", i.Application, i.VersionString, i.Commit, i.Date)
}

//nolint:gochecknoinits
func init() {
if versionString == "" {
versionString = defaultVersionString
}
}