maybe, finally, release logic works
This commit is contained in:
parent
088496e2fb
commit
a7e37626c0
1
argv.go
1
argv.go
|
@ -13,6 +13,7 @@ type args struct {
|
||||||
Force bool `arg:"--force" help:"remove things and redo them no matter what"`
|
Force bool `arg:"--force" help:"remove things and redo them no matter what"`
|
||||||
Strict bool `arg:"--strict" help:"never make go.* files unless everything is perfect"`
|
Strict bool `arg:"--strict" help:"never make go.* files unless everything is perfect"`
|
||||||
Purge bool `arg:"--purge" help:"purge all the git notes. this might be bad for you."`
|
Purge bool `arg:"--purge" help:"purge all the git notes. this might be bad for you."`
|
||||||
|
Smart bool `arg:"--smart" help:"whatever seems best at the time. never os.Exit(-1)"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (args) Version() string {
|
func (args) Version() string {
|
||||||
|
|
45
doSmart.go
45
doSmart.go
|
@ -8,45 +8,62 @@ import (
|
||||||
// this will make go.mod and go.sum files, but you have to
|
// this will make go.mod and go.sum files, but you have to
|
||||||
// have the files in .gitignore for now
|
// have the files in .gitignore for now
|
||||||
func doSmart(repo *gitpb.Repo) error {
|
func doSmart(repo *gitpb.Repo) error {
|
||||||
// if the repo has go.mod in the repo...
|
|
||||||
if err := repo.RepoIgnoresGoMod(); err != nil {
|
|
||||||
log.Info("go-mod-clean can not run on this repo", repo.GetGoPath())
|
|
||||||
log.Info("go.mod and go.sum must be git metadata to continue")
|
|
||||||
repo.ParseGoSum()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// erase the go.mod and go.sum files
|
// erase the go.mod and go.sum files
|
||||||
eraseGoMod(repo)
|
eraseGoMod(repo)
|
||||||
|
|
||||||
|
// if the repo has go.mod in the repo...
|
||||||
|
if err := repo.RepoIgnoresGoMod(); err != nil {
|
||||||
|
if repo.ParseGoSum() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
log.Info("go-mod-clean can not run on this repo", repo.GetGoPath())
|
||||||
|
log.Info("go.mod and go.sum must be git metadata to continue")
|
||||||
|
// return nil
|
||||||
|
}
|
||||||
|
if repo.Exists("go.mod") {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// try to restore from the git metadata
|
// try to restore from the git metadata
|
||||||
cname := repo.GetCurrentBranchName()
|
cname := repo.GetCurrentBranchName()
|
||||||
if err := repo.AutogenRestore(cname); err == nil {
|
if err := repo.AutogenRestore(cname); err == nil {
|
||||||
log.Info(repo.GetGoPath(), "files were restored ok from git metadata (notes)")
|
log.Info(repo.GetGoPath(), "files were restored ok from git metadata (notes)")
|
||||||
configSave = true
|
}
|
||||||
|
if repo.Exists("go.mod") {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// attempt to restore from ~/go/pkg/mod/
|
// attempt to restore from ~/go/pkg/mod/
|
||||||
if err := restoreFromGoPkg(repo); err == nil {
|
if err := restoreFromGoPkg(repo); err == nil {
|
||||||
configSave = true
|
log.Info(repo.GetGoPath(), "files were restored ok ~/go/mod/")
|
||||||
|
}
|
||||||
|
if repo.Exists("go.mod") {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// actually will re-create go.sum and go.mod now
|
// actually will re-create go.sum and go.mod now
|
||||||
if err := redoGoMod(repo); err != nil {
|
if err := redoGoMod(repo); err != nil {
|
||||||
return err
|
log.Info(repo.GetGoPath(), "the files were restored with redoGoMod()")
|
||||||
|
}
|
||||||
|
if repo.Exists("go.mod") {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// the first time, it'll attempt to fix some stuff
|
// the first time, it'll attempt to fix some stuff
|
||||||
cleanGoDepsCheckOk(repo)
|
cleanGoDepsCheckOk(repo)
|
||||||
// try to trim junk
|
// try to trim junk
|
||||||
if err := trimGoSum(repo); err != nil {
|
if err := trimGoSum(repo); err != nil {
|
||||||
return err
|
}
|
||||||
|
if repo.Exists("go.mod") {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
repo.ParseGoSum()
|
repo.ParseGoSum()
|
||||||
|
|
||||||
// everything worked more or less
|
if repo.Exists("go.mod") {
|
||||||
configSave = true
|
return nil
|
||||||
|
}
|
||||||
|
// last chance. just run go mod init
|
||||||
|
repo.RunVerbose([]string{"go", "mod", "init"})
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
30
main.go
30
main.go
|
@ -58,25 +58,20 @@ func main() {
|
||||||
}
|
}
|
||||||
okExit(check, "go.mod seems clean")
|
okExit(check, "go.mod seems clean")
|
||||||
}
|
}
|
||||||
|
if argv.Smart {
|
||||||
if err := doMain(check); err != nil {
|
// best effort
|
||||||
badExit(check, err)
|
if err := doSmart(check); err != nil {
|
||||||
|
// badExit(check, err)
|
||||||
}
|
}
|
||||||
|
okExit(check, "maybe it's ok")
|
||||||
|
}
|
||||||
|
|
||||||
if argv.Force {
|
if argv.Force {
|
||||||
if err := doForce(check); err != nil {
|
if err := doForce(check); err != nil {
|
||||||
badExit(check, err)
|
badExit(check, err)
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if err := doSmart(check); err != nil {
|
|
||||||
badExit(check, err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if configSave {
|
|
||||||
forge.ConfigSave()
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Info("forge.FinalGoDepsCheck() worked :", check.GetGoPath())
|
|
||||||
okExit(check, "go.sum seems clean")
|
okExit(check, "go.sum seems clean")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -111,14 +106,3 @@ func saveAsMetadata(repo *gitpb.Repo) error {
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func doMain(repo *gitpb.Repo) error {
|
|
||||||
if argv.Force {
|
|
||||||
err := doForce(repo)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// if --force or --strict is not set, fall back to a "smart" guess
|
|
||||||
// at what the user probably would want
|
|
||||||
return doSmart(repo)
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue