Fix current changelog link in gh version

mislav · mislav · commit 7b28605e6fe3 · 2020-01-28T18:31:12.000+01:00
Also allow pre-release tags.
diff --git a/command/root.go b/command/root.go
@@ -143,12 +143,11 @@ func colorableErr(cmd *cobra.Command) io.Writer {
 
 func changelogURL(version string) string {
 	path := "https://github.com/cli/cli"
-	r := regexp.MustCompile(`^v\d+\.\d+.\d+$`)
+	r := regexp.MustCompile(`^\d+\.\d+.\d+(-[\w.]+)?$`)
 	if !r.MatchString(version) {
 		return fmt.Sprintf("%s/releases/latest", path)
 	}
 
-	tag := version
-	url := fmt.Sprintf("%s/releases/tag/%s", path, tag)
+	url := fmt.Sprintf("%s/releases/tag/v%s", path, version)
 	return url
 }
diff --git a/command/root_test.go b/command/root_test.go
@@ -6,13 +6,20 @@ import (
 )
 
 func TestChangelogURL(t *testing.T) {
-	tag := "v0.3.2"
+	tag := "0.3.2"
 	url := fmt.Sprintf("https://github.com/cli/cli/releases/tag/v0.3.2")
 	result := changelogURL(tag)
 	if result != url {
 		t.Errorf("expected %s to create url %s but got %s", tag, url, result)
 	}
 
+	tag = "0.3.2-pre.1"
+	url = fmt.Sprintf("https://github.com/cli/cli/releases/tag/v0.3.2-pre.1")
+	result = changelogURL(tag)
+	if result != url {
+		t.Errorf("expected %s to create url %s but got %s", tag, url, result)
+	}
+
 	tag = "0.3.5-90-gdd3f0e0"
 	url = fmt.Sprintf("https://github.com/cli/cli/releases/latest")
 	result = changelogURL(tag)

Original file line number	Diff line number	Diff line change
`@@ -143,12 +143,11 @@ func colorableErr(cmd *cobra.Command) io.Writer {`
`143`	`143`
`144`	`144`	`func changelogURL(version string) string {`
`145`	`145`	`path := "https://github.com/cli/cli"`
`146`		- r := regexp.MustCompile(`^v\d+\.\d+.\d+$`)
	`146`	+ r := regexp.MustCompile(`^\d+\.\d+.\d+(-[\w.]+)?$`)
`147`	`147`	`if !r.MatchString(version) {`
`148`	`148`	`return fmt.Sprintf("%s/releases/latest", path)`
`149`	`149`	`}`
`150`	`150`
`151`		`- tag := version`
`152`		`- url := fmt.Sprintf("%s/releases/tag/%s", path, tag)`
	`151`	`+ url := fmt.Sprintf("%s/releases/tag/v%s", path, version)`
`153`	`152`	`return url`
`154`	`153`	`}`