From bced5e9a072a039e2fa3f66a8decfe23428147b9 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 21 Feb 2024 21:33:01 -0600 Subject: [PATCH] --release unsets GO111MODULE and vis-a-vis --- Makefile | 8 ++++---- stateWindow.go | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 01811f4..131ae3b 100644 --- a/Makefile +++ b/Makefile @@ -47,8 +47,8 @@ debian: mirrors: -wit mirrors -build-go-gui-toolkits: - ./go-deb --no-gui --repo go.wit.com/apps/go-gui-toolkits +build-go-gui-toolkits: build + ./go-deb --release --no-gui --repo go.wit.com/apps/go-gui-toolkits build-all: go-deb --no-gui --repo go.wit.com/apps/autotypist @@ -64,12 +64,12 @@ build-all: build-releases: go-deb --release --no-gui --repo go.wit.com/apps/autotypist + go-deb --release --no-gui --repo go.wit.com/apps/control-panel-dns go-deb --release --no-gui --repo go.wit.com/apps/control-panel-digitalocean + go-deb --release --no-gui --repo go.wit.com/apps/control-panel-cloudflare go-deb --release --no-gui --repo go.wit.com/apps/control-panel-vpn go-deb --release --no-gui --repo go.wit.com/apps/go-gui-toolkits go-deb --release --no-gui --repo go.wit.com/apps/guireleaser - go-deb --release --no-gui --repo go.wit.com/apps/control-panel-cloudflare - go-deb --release --no-gui --repo go.wit.com/apps/control-panel-dns go-deb --release --no-gui --repo go.wit.com/apps/go-deb go-deb --release --no-gui --repo go.wit.com/apps/go.wit.com go-deb --release --no-gui --repo go.wit.com/apps/helloworld diff --git a/stateWindow.go b/stateWindow.go index 857d795..0e0c61b 100644 --- a/stateWindow.go +++ b/stateWindow.go @@ -72,9 +72,7 @@ func (c *controlBox) buildPackage() bool { } } else { - if c.status.CheckDirty() { - os.Setenv("GO111MODULE", "off") - } + os.Setenv("GO111MODULE", "off") if shell.Run([]string{"go", "build", "-v", "-x"}) { log.Warn("build worked") } else { @@ -163,6 +161,11 @@ func (c *controlBox) buildPackage() bool { // experiment for the toolkit package if c.status.Exists("build") { + if args.Release { + os.Unsetenv("GO111MODULE") + } else { + os.Setenv("GO111MODULE", "off") + } shell.Run([]string{"./build"}) }