diff --git a/.toolbox.mk b/.toolbox.mk index c053602..ffabd6e 100644 --- a/.toolbox.mk +++ b/.toolbox.mk @@ -20,9 +20,9 @@ TB_OAPI_CODEGEN ?= $(TB_LOCALBIN)/oapi-codegen TB_SEMVER ?= $(TB_LOCALBIN)/semver ## Tool Versions -# renovate: packageName=sigs.k8s.io/controller-tools/cmd/controller-gen +# renovate: packageName=github.com/kubernetes-sigs/controller-tools TB_CONTROLLER_GEN_VERSION ?= v0.18.0 -# renovate: packageName=mvdan.cc/gofumpt +# renovate: packageName=github.com/mvdan/gofumpt TB_GOFUMPT_VERSION ?= v0.8.0 # renovate: packageName=github.com/golangci/golangci-lint/v2 TB_GOLANGCI_LINT_VERSION ?= v2.2.2 @@ -30,7 +30,7 @@ TB_GOLANGCI_LINT_VERSION ?= v2.2.2 TB_GOLINES_VERSION ?= v0.12.2 # renovate: packageName=github.com/goreleaser/goreleaser/v2 TB_GORELEASER_VERSION ?= v2.11.0 -# renovate: packageName=go.uber.org/mock/mockgen +# renovate: packageName=github.com/uber-go/mock TB_MOCKGEN_VERSION ?= v0.5.2 # renovate: packageName=github.com/oapi-codegen/oapi-codegen/v2 TB_OAPI_CODEGEN_VERSION ?= v2.4.1 diff --git a/pkg/sync/sync.go b/pkg/sync/sync.go index 76e936b..0f1a98e 100644 --- a/pkg/sync/sync.go +++ b/pkg/sync/sync.go @@ -3,10 +3,10 @@ package sync import ( "errors" "fmt" + "regexp" "runtime" "sort" "time" - "regexp" "github.com/robfig/cron/v3" "go.uber.org/zap" @@ -22,7 +22,7 @@ import ( ) var ( - l = log.GetLogger("sync") + l = log.GetLogger("sync") fixVersionCompareRegExp = regexp.MustCompile(`[^0-9.]`) ) diff --git a/pkg/versions/versions_test.go b/pkg/versions/versions_test.go index 495fe11..9de2e07 100644 --- a/pkg/versions/versions_test.go +++ b/pkg/versions/versions_test.go @@ -14,6 +14,11 @@ var _ = Describe("Versions", func() { Ω(versions.IsNewerThan("v0.106.9", "v0.106.10")).Should(BeFalse()) Ω(versions.IsNewerThan("v0.106.10", "0.106.9")).Should(BeTrue()) Ω(versions.IsNewerThan("v0.106.9", "0.106.10")).Should(BeFalse()) + // tests for #607 + Ω(versions.IsNewerThan("v0.108.0-b.72", versions.MinAgh)).Should(BeTrue()) + Ω(versions.IsNewerThan("0.108.0-b.72", versions.MinAgh)).Should(BeTrue()) + Ω(versions.IsNewerThan(versions.MinAgh, "v0.108.0-b.72")).Should(BeFalse()) + Ω(versions.IsNewerThan(versions.MinAgh, "0.108.0-b.72")).Should(BeFalse()) }) }) Context("IsSame", func() {