Fix compilation of -noupgrade builds

internal/upgrade/upgrade_supported.go

@@ -27,21 +27,21 @@ import (
 	"strings"
 )
 
-// Returns the latest release, including prereleases or not depending on the argument
-func LatestGithubRelease(version string) (Release, error) {
-	resp, err := http.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=10")
+// Returns the latest releases, including prereleases or not depending on the argument
+func LatestGithubReleases(version string) ([]Release, error) {
+	resp, err := http.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=30")
 	if err != nil {
-		return Release{}, err
+		return nil, err
 	}
 	if resp.StatusCode > 299 {
-		return Release{}, fmt.Errorf("API call returned HTTP error: %s", resp.Status)
+		return nil, fmt.Errorf("API call returned HTTP error: %s", resp.Status)
 	}
 
 	var rels []Release
 	json.NewDecoder(resp.Body).Decode(&rels)
 	resp.Body.Close()
 
-	return LatestRelease(version, rels)
+	return rels, nil
 }
 
 type SortByRelease []Release
@@ -56,7 +56,12 @@ func (s SortByRelease) Less(i, j int) bool {
 	return CompareVersions(s[i].Tag, s[j].Tag) > 0
 }
 
-func LatestRelease(version string, rels []Release) (Release, error) {
+func LatestRelease(version string) (Release, error) {
+	rels, _ := LatestGithubReleases(version)
+	return SelectLatestRelease(version, rels)
+}
+
+func SelectLatestRelease(version string, rels []Release) (Release, error) {
 	if len(rels) == 0 {
 		return Release{}, ErrVersionUnknown
 	}

internal/upgrade/upgrade_test.go

@@ -4,6 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+// +build !noupgrade
+
 package upgrade
 
 import (
@@ -65,7 +67,7 @@ var upgrades = map[string]string{
 	"v0.11.0-beta0+40-g53cb66e-dirty": "v0.11.0-beta0",
 }
 
-func TestRelease(t *testing.T) {
+func TestGithubRelease(t *testing.T) {
 	fd, err := os.Open("testdata/github-releases.json")
 	if err != nil {
 		t.Errorf("Missing github-release test data")
@@ -76,7 +78,7 @@ func TestRelease(t *testing.T) {
 	json.NewDecoder(fd).Decode(&rels)
 
 	for old, target := range upgrades {
-		upgrade, err := LatestRelease(old, rels)
+		upgrade, err := SelectLatestRelease(old, rels)
 		if err != nil {
 			t.Error("Error retrieving latest version", err)
 		}
@@ -85,3 +87,10 @@ func TestRelease(t *testing.T) {
 		}
 	}
 }
+
+func TestErrorRelease(t *testing.T) {
+	_, err := SelectLatestRelease("v0.11.0-beta", nil)
+	if err == nil {
+		t.Error("Should return an error when no release were available")
+	}
+}

internal/upgrade/upgrade_unsupp.go

@@ -16,6 +16,6 @@ func upgradeToURL(binary, url string) error {
 	return ErrUpgradeUnsupported
 }
 
-func LatestRelease(prerelease bool) (Release, error) {
+func LatestRelease(version string) (Release, error) {
 	return Release{}, ErrUpgradeUnsupported
 }