From a89b40c03b3b4c1ab18b913aff4f2d3d38ce0fbd Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 3 Oct 2025 22:02:21 -0500 Subject: trying to fix deb builds --- argv.go | 17 +++++++++++------ build.go | 26 ++++++++++++-------------- main.go | 3 +++ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/argv.go b/argv.go index 5cdf722..d658155 100644 --- a/argv.go +++ b/argv.go @@ -13,18 +13,24 @@ import ( */ type args struct { - Commit *EmptyCmd `arg:"subcommand:commit" help:"'git commit' but errors out if on wrong branch"` Show *EmptyCmd `arg:"subcommand:show" help:"show what would be done"` Gui *EmptyCmd `arg:"subcommand:gui" help:"open the gui"` Dump *EmptyCmd `arg:"subcommand:dump" help:"dump out the future control file"` Ldflags []string `arg:"--ldflags" help:"flags to pass to go build"` OutDir string `arg:"--dir" help:"write .deb file into this directory"` - Release bool `arg:"--release" help:"build a release from the last git tag"` + Namespace string `arg:"--namespace" help:"the namespace of the repo"` KeepFiles bool `arg:"--keep-files" help:"keep the build files/"` + Release bool `arg:"--release" help:"build version from the @latest git tag"` Force bool `arg:"--force" default:"false" help:"force overwrite an existing .deb file"` Verbose bool `arg:"--verbose" help:"show more things"` } +func (args) Examples() string { + var out string + out += "go-deb --dir ~/incoming/ --repo . # build a .deb of the current directory\n" + return out +} + func (args) Version() string { return "go-clone " + VERSION + " Built on " + BUILDTIME } @@ -35,10 +41,9 @@ type EmptyCmd struct { func (a args) Description() string { return ` Example usage: - guireleaser go.wit.com/apps/go-clone --increment --release --dry-run --reason "blerg" + go-deb --repo go.wit.com/apps/go-clone " -This will pull down the go sources and -the repositories in the go.sum file using git clone` +this is a work in progress` } /* @@ -55,7 +60,7 @@ func (args) Buildtime() (string, string) { func (a args) DoAutoComplete(pb *prep.Auto) { if pb.Cmd == "" { - pb.Autocomplete3([]string{"arch", "build", "gui", "show", "--version"}) + pb.Autocomplete3([]string{"dump", "gui", "show", "--version", "--keep-files"}) } else { pb.SubCommand(pb.Goargs...) } diff --git a/build.go b/build.go index f9773ae..85e3345 100644 --- a/build.go +++ b/build.go @@ -13,8 +13,6 @@ import ( ) func buildPackage(repo *gitpb.Repo) (bool, error) { - // TODO: if dirty, set GO111MODULE - // also, if last tag != version /* go install -ldflags " \ -X main.GITCOMMIT=${GITCOMMIT} \ @@ -76,24 +74,24 @@ func buildPackage(repo *gitpb.Repo) (bool, error) { cmd = append(cmd, "-v") cmd = append(cmd, "-x") } + cmd = append(cmd, repo.Namespace+"@v"+version) + if err := shell.PathExecVerbose("", cmd); err != nil { + badExit(err) + return false, fmt.Errorf("go build err %v", err) + } /* - cmd = append(cmd, "some path"+"@v"+version) + cmd = []string{"go"} + cmd = append(cmd, "build") + if argv.Verbose { + cmd = append(cmd, "-v") + cmd = append(cmd, "-x") + } + cmd = append(cmd, "this should be the path") if err := shell.PathExecVerbose("", cmd); err != nil { badExit(err) return false, fmt.Errorf("go build err %v", err) } */ - cmd = []string{"go"} - cmd = append(cmd, "build") - if argv.Verbose { - cmd = append(cmd, "-v") - cmd = append(cmd, "-x") - } - cmd = append(cmd, "this should be the path") - if err := shell.PathExecVerbose("", cmd); err != nil { - badExit(err) - return false, fmt.Errorf("go build err %v", err) - } log.Warn("build worked") } else { // set the GO111 build var to true. pass the versions to the compiler manually diff --git a/main.go b/main.go index 1438802..65d079a 100644 --- a/main.go +++ b/main.go @@ -41,6 +41,9 @@ func main() { log.Info("todo: show", me.repo.GetGoPath()) okExit("") } + if argv.Namespace != "" { + me.repo.Namespace = argv.Namespace + } log.Info("Namespace:", me.repo.GetNamespace(), "Fullpath:", me.repo.GetFullPath()) // figure out where we are working from -- cgit v1.2.3