From beb382619063a27cfed9eb95627e5e8b63cc4f75 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Fri, 17 Nov 2023 22:11:46 +0000 Subject: [PATCH] chore: upgrade GTS to v0.12.2 Also update magefiles to always enable logging to os.Stdout when verifying downloaded files. --- config | 2 +- magefiles/deploy.go | 4 +--- magefiles/download.go | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/config b/config index 2e25386..da24219 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 2e25386f4f48da38e34b0ea259b04f310d1a3c91 +Subproject commit da2421971dc58cfa90c472c59292129596408158 diff --git a/magefiles/deploy.go b/magefiles/deploy.go index 1c3dd63..ed402d9 100644 --- a/magefiles/deploy.go +++ b/magefiles/deploy.go @@ -12,8 +12,6 @@ import ( // Deploy deploys the services to the Flow Platform. func Deploy(environment, name string) error { - os.Setenv("MAGEFILE_VERBOSE", "true") - mg.Deps( mg.F(Prepare, environment, name), ) @@ -39,5 +37,5 @@ func Deploy(environment, name string) error { command = append(command, name) } - return sh.Run(command[0], command[1:]...) + return sh.RunV(command[0], command[1:]...) } diff --git a/magefiles/download.go b/magefiles/download.go index 36f0208..d47d470 100644 --- a/magefiles/download.go +++ b/magefiles/download.go @@ -290,7 +290,7 @@ func download(pack downloadPack) error { if pack.validateGPGSignature { for i := range pack.packages { - if err := sh.Run("gpg", "--verify", pack.packages[i].gpgSignature.destination, pack.packages[i].file.destination); err != nil { + if err := sh.RunV("gpg", "--verify", pack.packages[i].gpgSignature.destination, pack.packages[i].file.destination); err != nil { return fmt.Errorf("GPG verification failed for '%s'; %w", pack.packages[i].file.destination, err) } } @@ -308,7 +308,7 @@ func download(pack downloadPack) error { checksum := filepath.Base(pack.checksum.destination) - if err := sh.Run("sha256sum", "--check", "--ignore-missing", checksum); err != nil { + if err := sh.RunV("sha256sum", "--check", "--ignore-missing", checksum); err != nil { return err }