summaryrefslogtreecommitdiff
path: root/redoGoMod.go
diff options
context:
space:
mode:
Diffstat (limited to 'redoGoMod.go')
-rw-r--r--redoGoMod.go28
1 files changed, 15 insertions, 13 deletions
diff --git a/redoGoMod.go b/redoGoMod.go
index f25a3b4..3af8663 100644
--- a/redoGoMod.go
+++ b/redoGoMod.go
@@ -30,26 +30,26 @@ func setGoVersion(repo *gitpb.Repo, version string) error {
}
// wrapper around 'go mod init' and 'go mod tidy'
-func redoGoMod(repo *gitpb.Repo) (bool, error) {
+func redoGoMod(repo *gitpb.Repo) error {
// unset the go development ENV var to generate release files
os.Unsetenv("GO111MODULE")
if err := repo.StrictRun([]string{"rm", "-f", "go.mod", "go.sum"}); err != nil {
log.Warn("rm go.mod go.sum failed", err)
- return false, err
+ return err
}
if err := repo.StrictRun([]string{"go", "mod", "init", repo.GoPath}); err != nil {
log.Warn("go mod init failed", err)
- return false, err
+ return err
}
if err := repo.StrictRun([]string{"go", "mod", "tidy"}); err != nil {
log.Warn("go mod tidy failed", err)
- return false, err
+ return err
}
// most things should build with golang after 1.20 // todo: allow this to be set somewhere
if err := setGoVersion(repo, "1.20"); err != nil {
log.Warn(repo.GoPath, "go mod edit failed", err)
- return false, err
+ return err
}
repo.GoDeps = nil
@@ -57,29 +57,31 @@ func redoGoMod(repo *gitpb.Repo) (bool, error) {
// if there is not a go.sum file, it better be a primitive golang project
if !repo.Exists("go.sum") {
- // this should never happen
- return false, errors.New("MakeRedomod() logic failed")
-
+ // todo. fix this logic
ok, err := repo.IsPrimitive()
if err != nil {
// this means this repo does not depend on any other package
log.Info("PRIMATIVE repo error:", repo.GoPath, "err =", err)
- return false, err
+ return err
}
if ok {
// this means the repo is primitive so there is no go.sum
repo.GoPrimitive = true
- return true, nil
+ repo.GoDeps = new(gitpb.GoDeps)
+ return nil
}
}
- repo.GoDeps = new(gitpb.GoDeps)
if !repo.Exists("go.sum") {
// this should never happen
- return false, errors.New("MakeRedomod() logic failed")
+ data, _ := repo.ReadFile("go.mod")
+ log.Info(string(data))
+ return errors.New("missing go.sum file on non-primitive go.mod")
}
+ repo.GoDeps = new(gitpb.GoDeps)
// return the attempt to parse go.sum
- return repo.ParseGoSum()
+ _, err := repo.ParseGoSum()
+ return err
}