From 9e47f9d1cd91cba3b345c3ed7c5a72ac31b940c1 Mon Sep 17 00:00:00 2001 From: Baptiste Canton Date: Mon, 24 Jun 2024 22:21:15 +0200 Subject: [PATCH] mage builds support '-gocmd' --- magefiles/magefile.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/magefiles/magefile.go b/magefiles/magefile.go index fee963c8..60306100 100644 --- a/magefiles/magefile.go +++ b/magefiles/magefile.go @@ -21,6 +21,7 @@ var Default = BuildDefaultAndTest var ( defaultBuildArgs = []string{"build"} binaryName = "ccat" + goBin = mg.GoCmd() ) func init() { @@ -65,7 +66,7 @@ func build(tags string) error { buildArgs := defaultBuildArgs buildArgs = append(buildArgs, "-ldflags", ldFlags(tags), "-tags", tags) - if err := sh.RunWithV(nil, "go", buildArgs...); err != nil { + if err := sh.RunWithV(nil, goBin, buildArgs...); err != nil { return err } @@ -115,7 +116,7 @@ func Install() error { // go mod download func InstallDeps() error { stepPrintln("Installing Deps...") - if err := sh.RunV("go", "mod", "download"); err != nil { + if err := sh.RunV(goBin, "mod", "download"); err != nil { return err } stepOKPrintln("Installing Deps OK") @@ -126,7 +127,7 @@ func InstallDeps() error { func VerifyDeps() error { mg.Deps(InstallDeps) stepPrintln("Verifying Deps...") - if err := sh.Run("go", "mod", "verify"); err != nil { + if err := sh.Run(goBin, "mod", "verify"); err != nil { return err } stepOKPrintln("Verifying Deps OK") @@ -146,7 +147,7 @@ func Clean() error { func TestGo() error { mg.Deps(InstallDeps) stepPrintln("Testing Go...") - r, err := sh.Output("go", "test", "./...") + r, err := sh.Output(goBin, "test", "./...") if mg.Verbose() { fmt.Println(r, "\n ") }