gofmt on CI

.github/workflows/ci.yml

@@ -32,3 +32,18 @@ jobs:
         go test -tags CI -race ./...
       env:
         GOPATH: /home/runner/go
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Go ${{ matrix.go-version }}
+      uses: actions/setup-go@v4
+      with:
+        go-version: ${{ matrix.go-version }}
+
+    - name: Lint
+      uses: Jerome1337/gofmt-action@v1.0.5
+      with:
+        gofmt-path: './'
+        gofmt-flags: '-l -d'

bootstrap.go

@@ -1,4 +1,5 @@
-//+build ignore
+//go:build ignore
+// +build ignore
 
 package main
 

install_test.go

@@ -1,4 +1,5 @@
-//+build CI
+//go:build CI
+// +build CI
 
 package main
 

mage/testdata/alias/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/args/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/compiled/custom.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 // Compiled package description.

mage/testdata/context/context.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/error.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/func.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/goos_magefiles/magefile_nonwindows.go

@@ -1,3 +1,4 @@
+//go:build mage && !windows
 // +build mage,!windows
 
 package main

mage/testdata/goos_magefiles/magefile_windows.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/invalid_alias/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/keep_flag/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/list/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 // This is a comment on the package which should get turned into output with the

mage/testdata/mageimport/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mageimport/oneline/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/mageimport/samenamespace/duptargets/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package sametarget

mage/testdata/mageimport/samenamespace/uniquetargets/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/mageimport/tagged/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mageimport/tagged/pkg/mage.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package pkg
 

mage/testdata/main.go

@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

mage/testdata/mixed_lib_files/lib.go

@@ -5,4 +5,4 @@
 
 package lib
 
-func Build() {]}
+func Build() {}

mage/testdata/mixed_lib_files/mage_helpers.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mixed_lib_files/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mixed_lib_files/subdir/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/mixed_main_files/mage_helpers.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mixed_main_files/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/namespaces/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/no_default/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/onlyStdLib/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/panic.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/setdir/setdir.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/setworkdir/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/signals/signals.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/transitiveDeps/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/wrong_dep/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mg/deps.go

@@ -72,10 +72,12 @@ func SerialCtxDeps(ctx context.Context, fns ...interface{}) {
 
 // CtxDeps runs the given functions as dependencies of the calling function.
 // Dependencies must only be of type:
-//     func()
-//     func() error
-//     func(context.Context)
-//     func(context.Context) error
+//
+//	func()
+//	func() error
+//	func(context.Context)
+//	func(context.Context) error
+//
 // Or a similar method on a mg.Namespace type.
 // Or an mg.Fn interface.
 //
@@ -148,10 +150,12 @@ func checkFns(fns []interface{}) []Fn {
 
 // Deps runs the given functions in parallel, exactly once. Dependencies must
 // only be of type:
-//     func()
-//     func() error
-//     func(context.Context)
-//     func(context.Context) error
+//
+//	func()
+//	func() error
+//	func(context.Context)
+//	func(context.Context) error
+//
 // Or a similar method on a mg.Namespace type.
 // Or an mg.Fn interface.
 //

mg/fn_test.go

@@ -117,11 +117,11 @@ func TestFuncCheck(t *testing.T) {
 	}
 
 	defer func() {
-		if r := recover(); r !=nil {
+		if r := recover(); r != nil {
 			t.Error("expected a nil function argument to be handled gracefully")
 		}
 	}()
-	_, _, err = checkF(nil, []interface{}{1,2})
+	_, _, err = checkF(nil, []interface{}{1, 2})
 	if err == nil {
 		t.Error("expected a nil function argument to be invalid")
 	}

parse/testdata/alias.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/func.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/importself/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

parse/testdata/importself/targets.go

@@ -4,4 +4,4 @@ import "fmt"
 
 func Stuff() {
 	fmt.Println("stuff")
-}
+}

parse/testdata/repeating_synopsis.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/subcommand_1.9.go

@@ -1,4 +1,5 @@
-//+build mage,go1.9
+//go:build mage && go1.9
+// +build mage,go1.9
 
 package main
 

parse/testdata/subcommands.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

sh/cmd.go

@@ -16,19 +16,19 @@ import (
 // useful for creating command aliases to make your scripts easier to read, like
 // this:
 //
-//  // in a helper file somewhere
-//  var g0 = sh.RunCmd("go")  // go is a keyword :(
+//	 // in a helper file somewhere
+//	 var g0 = sh.RunCmd("go")  // go is a keyword :(
 //
-//  // somewhere in your main code
-//	if err := g0("install", "github.com/gohugo/hugo"); err != nil {
-//		return err
-//  }
+//	 // somewhere in your main code
+//		if err := g0("install", "github.com/gohugo/hugo"); err != nil {
+//			return err
+//	 }
 //
 // Args passed to command get baked in as args to the command when you run it.
 // Any args passed in when you run the returned function will be appended to the
 // original args.  For example, this is equivalent to the above:
 //
-//  var goInstall = sh.RunCmd("go", "install") goInstall("github.com/gohugo/hugo")
+//	var goInstall = sh.RunCmd("go", "install") goInstall("github.com/gohugo/hugo")
 //
 // RunCmd uses Exec underneath, so see those docs for more details.
 func RunCmd(cmd string, args ...string) func(args ...string) error {
@@ -133,17 +133,18 @@ func run(env map[string]string, stdout, stderr io.Writer, cmd string, args ...st
 	c.Stdout = stdout
 	c.Stdin = os.Stdin
 
-	var quoted []string 
-	for i := range args {
-		quoted = append(quoted, fmt.Sprintf("%q", args[i]));
-	}
 	// To protect against logging from doing exec in global variables
 	if mg.Verbose() {
+		var quoted []string
+		for i := range args {
+			quoted = append(quoted, fmt.Sprintf("%q", args[i]))
+		}
 		log.Println("exec:", cmd, strings.Join(quoted, " "))
 	}
 	err = c.Run()
 	return CmdRan(err), ExitStatus(err), err
 }
+
 // CmdRan examines the error to determine if it was generated as a result of a
 // command running via os/exec.Command.  If the error is nil, or the command ran
 // (even if it exited with a non-zero exit code), CmdRan reports true.  If the