fix: update nightly releases (#125)
Nightly updates correctly detected the newest version, but the installer always queried GitHub’s `/releases/latest` endpoint. Since that endpoint only returns the latest stable release, `iris update` downloaded the stable binary even when the nightly channel was configured. This change passes the selected nightly tag to the installer through `IRIS_RELEASE_TAG`. When set, the installer queries `/releases/tags/<tag>`, locates that nightly release’s assets, and installs the correct binary. Stable updates continue to use `/releases/latest` unchanged.
This commit is contained in:
+16
-4
@@ -90,14 +90,14 @@ func FetchLatestVersion() (string, error) {
|
||||
func IsNewer(current, latest string) bool {
|
||||
c := strings.TrimPrefix(current, "v")
|
||||
l := strings.TrimPrefix(latest, "v")
|
||||
|
||||
channel := config.Get().Updater.Channel
|
||||
// dev builds or empty versions never trigger an update
|
||||
if c == "" || c == "dev" || l == "" || l == "dev" {
|
||||
return false
|
||||
}
|
||||
|
||||
// nightly builds are never shown as stable update targets
|
||||
if config.Get().Updater.Channel != "nightly" && strings.Contains(l, "-nightly.") {
|
||||
if channel != "nightly" && strings.Contains(l, "-nightly.") {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -124,6 +124,10 @@ func IsNewer(current, latest string) bool {
|
||||
}
|
||||
}
|
||||
|
||||
if channel == "nightly" && strings.Contains(l, "-nightly.") && c != l {
|
||||
return true
|
||||
}
|
||||
|
||||
// if all parts are equal, the one with more parts is newer (e.g. 1.0.1 > 1.0)
|
||||
return len(lParts) > len(cParts)
|
||||
}
|
||||
@@ -245,9 +249,17 @@ var updateCmd = &cobra.Command{
|
||||
|
||||
// download and replace the binary using the install script
|
||||
installScript := "https://raw.githubusercontent.com/versenilvis/iris/main/scripts/install.sh"
|
||||
fmt.Printf("running: curl -sSL %s | sh\n\n", installScript)
|
||||
command := "curl -sSL " + installScript + " | sh"
|
||||
runningPrefix := ""
|
||||
if config.Get().Updater.Channel == "nightly" {
|
||||
runningPrefix = fmt.Sprintf("IRIS_RELEASE_TAG=%s ", latest)
|
||||
}
|
||||
fmt.Printf("running: %s%s\n\n", runningPrefix, command)
|
||||
|
||||
cmdRun := exec.Command("sh", "-c", "curl -sSL "+installScript+" | sh")
|
||||
cmdRun := exec.Command("sh", "-c", command)
|
||||
if config.Get().Updater.Channel == "nightly" {
|
||||
cmdRun.Env = append(os.Environ(), "IRIS_RELEASE_TAG="+latest)
|
||||
}
|
||||
cmdRun.Stdout = os.Stdout
|
||||
cmdRun.Stderr = os.Stderr
|
||||
cmdRun.Stdin = os.Stdin
|
||||
|
||||
+27
-13
@@ -10,27 +10,41 @@ import (
|
||||
)
|
||||
|
||||
func TestIsNewer(t *testing.T) {
|
||||
originalConfig := config.Get()
|
||||
t.Cleanup(func() {
|
||||
config.Init(originalConfig)
|
||||
})
|
||||
|
||||
tests := []struct {
|
||||
current string
|
||||
latest string
|
||||
channel string
|
||||
want bool
|
||||
}{
|
||||
{"v1.0.0", "v1.0.1", true},
|
||||
{"v1.0.1", "v1.0.0", false},
|
||||
{"v1.0.0", "v1.0.0", false},
|
||||
{"v1.2.3", "v1.2.4", true},
|
||||
{"v1.2.0", "v1.1.9", false},
|
||||
{"dev", "v1.0.0", false}, // dev never updates
|
||||
{"v1.0.0", "dev", false},
|
||||
{"", "v1.0.0", false},
|
||||
{"v1.0.0", "v1.1.0-nightly.8cb1f47", false}, // nightly never triggers update
|
||||
{"v1.1.0-nightly.abc", "v1.2.0", true}, // but if you are on nightly, you can update to stable
|
||||
{"v1.0.0", "v1.0.1", "stable", true},
|
||||
{"v1.0.1", "v1.0.0", "stable", false},
|
||||
{"v1.0.0", "v1.0.0", "stable", false},
|
||||
{"v1.2.3", "v1.2.4", "stable", true},
|
||||
{"v1.2.0", "v1.1.9", "stable", false},
|
||||
{"dev", "v1.0.0", "stable", false}, // dev never updates
|
||||
{"v1.0.0", "dev", "stable", false},
|
||||
{"", "v1.0.0", "stable", false},
|
||||
{"v1.0.0", "v1.1.0-nightly.8cb1f47", "stable", false}, // nightly never triggers update
|
||||
{"v1.1.0-nightly.abc", "v1.2.0", "stable", true}, // but if you are on nightly, you can update to stable
|
||||
{"v1.1.0-nightly.abc", "v1.1.0-nightly.def", "nightly", true}, // nightly can update to newer nightly
|
||||
{"v1.1.0-nightly.abc", "v1.1.0-nightly.abc", "nightly", false}, // same nightly is not newer
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
if got := IsNewer(tt.current, tt.latest); got != tt.want {
|
||||
t.Errorf("IsNewer(%q, %q) = %v; want %v", tt.current, tt.latest, got, tt.want)
|
||||
}
|
||||
t.Run(tt.current+"_"+tt.latest+"_"+tt.channel, func(t *testing.T) {
|
||||
cfg := config.DefaultConfig()
|
||||
cfg.Updater.Channel = tt.channel
|
||||
config.Init(cfg)
|
||||
|
||||
if got := IsNewer(tt.current, tt.latest); got != tt.want {
|
||||
t.Errorf("IsNewer(%q, %q, %q) = %v; want %v", tt.current, tt.latest, tt.channel, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user