From 491c4455d8e3df13d9ef1ce52751cc35292ad337 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 17 Dec 2024 20:47:35 -0600 Subject: [PATCH] use GetGoPrimitive() --- Makefile | 7 +++++++ findNext.go | 6 +++++- http.go | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2b1ce6c..25aa5a4 100644 --- a/Makefile +++ b/Makefile @@ -98,3 +98,10 @@ curl-list-everything: curl-file-for-go.wit.com: curl --silent http://localhost:9419/goweblist?readonly=true curl --silent http://localhost:9419/goweblist?readonly=true |sort > ~/go.wit.com.versions + +safe-build: install + forge --find-private + wit-package --no-gui --make-install + cd ~/go/src/go.wit.com/lib/xgb/ && GUIRELEASE_REASON="safe-build" guireleaser + + diff --git a/findNext.go b/findNext.go index 1e04bc9..bb11064 100644 --- a/findNext.go +++ b/findNext.go @@ -134,7 +134,11 @@ func fixGodeps(check *gitpb.Repo) bool { return false } // skip primative ones - if ok, _ := check.IsPrimitive(); ok { + if check.GetGoPrimitive() { + if check.Exists("go.sum") { + log.Info("fixGoDeps() has go.sum but says it is primitive", check.GetGoPath()) + return false + } log.Info("fixGoDeps() skipping primitive", check.GetGoPath()) return true } diff --git a/http.go b/http.go index 7665c7f..3db18bc 100644 --- a/http.go +++ b/http.go @@ -276,7 +276,7 @@ func showNext() { } else { log.Info("CheckDirty() == false") } - if ok, _ := check.IsPrimitive(); ok { + if check.GetGoPrimitive() { log.Info("IsPrimitive() == true") } else { log.Info("IsPrimitive() == false")