lure
/
lure
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 13 Activity

Improve check for valid version when pulling repo
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Elara 2023-10-09 19:48:57 -07:00
parent 00406493c2
commit ba1a39874e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/repos/pull.go
View File

@ -34,6 +34,7 @@ import (
"github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/format/diff" "github.com/go-git/go-git/v5/plumbing/format/diff"
"github.com/pelletier/go-toml/v2" "github.com/pelletier/go-toml/v2"
"go.elara.ws/vercmp"
"lure.sh/lure/internal/config" "lure.sh/lure/internal/config"
"lure.sh/lure/internal/db" "lure.sh/lure/internal/db"
"lure.sh/lure/internal/shutils" "lure.sh/lure/internal/shutils"
@ -41,7 +42,6 @@ import (
"lure.sh/lure/internal/types" "lure.sh/lure/internal/types"
"lure.sh/lure/pkg/distro" "lure.sh/lure/pkg/distro"
"lure.sh/lure/pkg/loggerctx" "lure.sh/lure/pkg/loggerctx"
"go.elara.ws/vercmp"
"mvdan.cc/sh/v3/expand" "mvdan.cc/sh/v3/expand"
"mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/interp"
"mvdan.cc/sh/v3/syntax" "mvdan.cc/sh/v3/syntax"
@ -156,9 +156,11 @@ func Pull(ctx context.Context, repos []types.Repo) error {
} }
fl.Close() fl.Close()
if config.Version != "unknown" { // If the version doesn't have a "v" prefix, it's not a standard version.
currentVer, _, _ := strings.Cut(config.Version, "-") // It may be "unknown" or a git version, but either way, there's no way
if vercmp.Compare(currentVer, repoCfg.Repo.MinVersion) == -1 { // to compare it to the repo version, so only compare versions with the "v".
if strings.HasPrefix(config.Version, "v") {
if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
log.Warn("LURE repo's minumum LURE version is greater than the current version. Try updating LURE if something doesn't work.").Str("repo", repo.Name).Send() log.Warn("LURE repo's minumum LURE version is greater than the current version. Try updating LURE if something doesn't work.").Str("repo", repo.Name).Send()
} }
} }