Skip to content

Commit

Permalink
fix version detection
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitpaulk committed Oct 30, 2022
1 parent e287d6f commit 4200178
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
1 change: 1 addition & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ builds:
- env:
- CGO_ENABLED=0
main: ./cmd/codecrafters
ldflags: "-s -w -X utils.version={{.Version}} -X utils.commit={{.Commit}}"
archives:
- name_template: "{{ .Tag }}_{{ .Os }}_{{ .Arch }}"
format: binary
6 changes: 2 additions & 4 deletions cmd/codecrafters/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ import (
"flag"
"fmt"
"github.com/codecrafters-io/cli/internal/commands"
"github.com/codecrafters-io/cli/internal/utils"
"os"
)

var version string = "0"
var commit string = "unknown"

// Usage: codecrafters test
func main() {
flag.Usage = func() {
Expand All @@ -23,7 +21,7 @@ USAGE
COMMANDS
test: run tests on project in current directory
`, fmt.Sprintf("v%s-%s", version, commit[:7]))
`, utils.VersionString())

}

Expand Down
9 changes: 4 additions & 5 deletions internal/utils/codecrafters_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,16 @@ type FetchSubmissionResponse struct {
}

type CodecraftersClient struct {
ServerUrl string
CLIVersion string
ServerUrl string
}

func NewCodecraftersClient(serverUrl string, cliVersion string) CodecraftersClient {
return CodecraftersClient{ServerUrl: serverUrl, CLIVersion: cliVersion}
func NewCodecraftersClient(serverUrl string) CodecraftersClient {
return CodecraftersClient{ServerUrl: serverUrl}
}

func (c CodecraftersClient) headers() map[string]string {
return map[string]string{
"X-Codecrafters-CLI-Version": c.CLIVersion,
"X-Codecrafters-CLI-Version": VersionString(),
}
}

Expand Down
10 changes: 10 additions & 0 deletions internal/utils/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package utils

import "fmt"

var version string = "0"
var commit string = "unknown"

func VersionString() string {
return fmt.Sprintf("v%s-%s", version, commit[:7])
}

0 comments on commit 4200178

Please sign in to comment.