mirror of
https://github.com/helmfile/helmfile.git
synced 2026-10-04 14:11:47 +02:00
consistently use Masterminds/semver (#1209)
This commit is contained in:
@@ -51,7 +51,7 @@ require (
|
||||
github.com/a8m/envsubst v1.3.0 // indirect
|
||||
github.com/aws/aws-sdk-go v1.48.15
|
||||
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
|
||||
github.com/blang/semver v3.5.1+incompatible
|
||||
github.com/blang/semver v3.5.1+incompatible // indirect
|
||||
github.com/dimchansky/utfbom v1.1.1 // indirect
|
||||
github.com/fatih/color v1.15.0 // indirect
|
||||
github.com/fujiwara/tfstate-lookup v1.1.5 // indirect
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package testutil
|
||||
|
||||
import (
|
||||
"github.com/blang/semver"
|
||||
"github.com/Masterminds/semver/v3"
|
||||
"helm.sh/helm/v3/pkg/chart"
|
||||
|
||||
"github.com/helmfile/helmfile/pkg/helmexec"
|
||||
@@ -35,7 +35,7 @@ func (helm *V3HelmExec) IsHelm3() bool {
|
||||
func (helm *VersionHelmExec) IsVersionAtLeast(ver string) bool {
|
||||
currentSemVer := semver.MustParse(helm.version)
|
||||
verSemVer := semver.MustParse(ver)
|
||||
return currentSemVer.GTE(verSemVer)
|
||||
return currentSemVer.Compare(verSemVer) >= 0
|
||||
}
|
||||
|
||||
func (helm *noCallHelmExec) doPanic() {
|
||||
|
||||
Reference in New Issue
Block a user