From bbbc18b95989da1b0184a983ca8a7334e467066c Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 8 Nov 2022 18:11:17 +0100 Subject: [PATCH] GODT-1977: revert the pre-release changes. --- cmd/launcher/main.go | 2 +- internal/bridge/updates.go | 7 +++---- internal/versioner/versioner.go | 7 ------- internal/versioner/versioner_test.go | 15 --------------- 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/cmd/launcher/main.go b/cmd/launcher/main.go index 9b6302f9..9159f07e 100644 --- a/cmd/launcher/main.go +++ b/cmd/launcher/main.go @@ -241,7 +241,7 @@ func getPathToUpdatedExecutable( } // Skip versions that are less or equal to launcher version. - if currentVersion != nil && !versioner.IsNewerIgnorePrerelease(version.SemVer(), currentVersion) { + if currentVersion != nil && !version.SemVer().GreaterThan(currentVersion) { continue } diff --git a/internal/bridge/updates.go b/internal/bridge/updates.go index d1b6444a..564d8247 100644 --- a/internal/bridge/updates.go +++ b/internal/bridge/updates.go @@ -24,7 +24,6 @@ import ( "github.com/ProtonMail/proton-bridge/v2/internal/events" "github.com/ProtonMail/proton-bridge/v2/internal/safe" "github.com/ProtonMail/proton-bridge/v2/internal/updater" - "github.com/ProtonMail/proton-bridge/v2/internal/versioner" "github.com/sirupsen/logrus" ) @@ -60,7 +59,7 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) { }) switch { - case !versioner.IsNewerIgnorePrerelease(version.Version, bridge.curVersion): + case !version.Version.GreaterThan(bridge.curVersion): log.Debug("No update available") bridge.publish(events.UpdateNotAvailable{}) @@ -70,7 +69,7 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) { bridge.publish(events.UpdateNotAvailable{}) - case versioner.IsNewerIgnorePrerelease(version.MinAuto, bridge.curVersion): + case bridge.curVersion.LessThan(version.MinAuto): log.Info("An update is available but is incompatible with this version") bridge.publish(events.UpdateAvailable{ @@ -90,7 +89,7 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) { default: safe.RLock(func() { - if versioner.IsNewerIgnorePrerelease(version.Version, bridge.newVersion) { + if version.Version.GreaterThan(bridge.newVersion) { log.Info("An update is available") select { diff --git a/internal/versioner/versioner.go b/internal/versioner/versioner.go index c69cb28b..787068fe 100644 --- a/internal/versioner/versioner.go +++ b/internal/versioner/versioner.go @@ -84,10 +84,3 @@ func getExecutableInDirectory(name, directory string) (string, error) { return exe, nil } - -func IsNewerIgnorePrerelease(a, b *semver.Version) bool { - aN, _ := a.SetPrerelease("") - bN, _ := b.SetPrerelease("") - - return aN.GreaterThan(&bN) -} diff --git a/internal/versioner/versioner_test.go b/internal/versioner/versioner_test.go index 7c4c9d56..fef55469 100644 --- a/internal/versioner/versioner_test.go +++ b/internal/versioner/versioner_test.go @@ -27,21 +27,6 @@ import ( "github.com/stretchr/testify/require" ) -func TestIsNewerIgnorePrelease(t *testing.T) { - // older - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.1"))) - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0"))) - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0+qa"))) - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0-dev"))) - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0-dev+qa"))) - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0+qa"), semver.MustParse("2.5.0-dev"))) - assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0-dev"), semver.MustParse("2.5.0+qa"))) - - // not older - assert.True(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.4.9-dev+qa"))) - assert.True(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0-dev+qa"), semver.MustParse("2.4.9"))) -} - func TestListVersions(t *testing.T) { dir := t.TempDir()