From 48bcafb2e388295567476f35e45b814f71692061 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 7 Oct 2025 19:05:39 -0500 Subject: break up these steps somewhat --- Makefile | 5 ++++- doBuild.go | 5 ----- doDebian.go | 5 +++++ doPublish.go | 13 ------------- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 8c0ebae..81bb8fb 100644 --- a/Makefile +++ b/Makefile @@ -72,4 +72,7 @@ apt-update: -o APT::Get::List-Cleanup=0 publish: - GUIRELEASE_REASON="test publish" wit publish + GUIRELEASE_REASON="automated" wit publish + forge show + wit build deb --verbose + forge normal diff --git a/doBuild.go b/doBuild.go index 4860150..6267b85 100644 --- a/doBuild.go +++ b/doBuild.go @@ -30,11 +30,6 @@ func doBuild() error { if argv.Build.Debian != nil { doBuildDeb() - if totalBuilt > 0 { - if _, err := shell.RunRealtimeError([]string{"do-aptly"}); err != nil { - me.sh.BadExit("aptly failed", nil) - } - } okExit("") } diff --git a/doDebian.go b/doDebian.go index fd2bde2..0a6be8d 100644 --- a/doDebian.go +++ b/doDebian.go @@ -54,6 +54,11 @@ func doBuildDeb() error { return stat.Err } } + if totalBuilt > 0 { + if _, err := shell.RunRealtimeError([]string{"do-aptly"}); err != nil { + me.sh.BadExit("aptly failed", nil) + } + } return nil } diff --git a/doPublish.go b/doPublish.go index 0c13f55..8624e00 100644 --- a/doPublish.go +++ b/doPublish.go @@ -62,19 +62,6 @@ func doPublish() error { me.sh.BadExit("publishing failed", nil) } - if err := doBuildDeb(); err != nil { - me.sh.BadExit("debian packages failed", err) - } - if totalBuilt > 0 { - if _, err := shell.RunRealtimeError([]string{"do-aptly"}); err != nil { - me.sh.BadExit("aptly failed", nil) - } - } - - if _, err := shell.RunRealtimeError([]string{"forge", "mode", "normal"}); err != nil { - me.sh.BadExit("forge mode normal", err) - } - me.sh.GoodExit("PUBLISH WORKED") return nil } -- cgit v1.2.3