Skip to content

Commit 4200178

Browse files
committedOct 30, 2022
fix version detection
1 parent e287d6f commit 4200178

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed
 

‎.goreleaser.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ builds:
22
- env:
33
- CGO_ENABLED=0
44
main: ./cmd/codecrafters
5+
ldflags: "-s -w -X utils.version={{.Version}} -X utils.commit={{.Commit}}"
56
archives:
67
- name_template: "{{ .Tag }}_{{ .Os }}_{{ .Arch }}"
78
format: binary

‎cmd/codecrafters/main.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ import (
44
"flag"
55
"fmt"
66
"github.com/codecrafters-io/cli/internal/commands"
7+
"github.com/codecrafters-io/cli/internal/utils"
78
"os"
89
)
910

10-
var version string = "0"
11-
var commit string = "unknown"
12-
1311
// Usage: codecrafters test
1412
func main() {
1513
flag.Usage = func() {
@@ -23,7 +21,7 @@ USAGE
2321
2422
COMMANDS
2523
test: run tests on project in current directory
26-
`, fmt.Sprintf("v%s-%s", version, commit[:7]))
24+
`, utils.VersionString())
2725

2826
}
2927

‎internal/utils/codecrafters_client.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@ type FetchSubmissionResponse struct {
2626
}
2727

2828
type CodecraftersClient struct {
29-
ServerUrl string
30-
CLIVersion string
29+
ServerUrl string
3130
}
3231

33-
func NewCodecraftersClient(serverUrl string, cliVersion string) CodecraftersClient {
34-
return CodecraftersClient{ServerUrl: serverUrl, CLIVersion: cliVersion}
32+
func NewCodecraftersClient(serverUrl string) CodecraftersClient {
33+
return CodecraftersClient{ServerUrl: serverUrl}
3534
}
3635

3736
func (c CodecraftersClient) headers() map[string]string {
3837
return map[string]string{
39-
"X-Codecrafters-CLI-Version": c.CLIVersion,
38+
"X-Codecrafters-CLI-Version": VersionString(),
4039
}
4140
}
4241

‎internal/utils/version.go

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package utils
2+
3+
import "fmt"
4+
5+
var version string = "0"
6+
var commit string = "unknown"
7+
8+
func VersionString() string {
9+
return fmt.Sprintf("v%s-%s", version, commit[:7])
10+
}

0 commit comments

Comments
 (0)
Please sign in to comment.