rebase to master and bump golangci-lint

martinlindhe · martinlindhe · commit 06ce4cf91bcd · 2021-10-28T14:56:35.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.32
+          version: v1.42
           args: -c .golangci.yml
   test:
     name: Test
diff --git a/apptest/fsOSWin.go b/apptest/fsOSWin.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package apptest
diff --git a/exec/winAPI.go b/exec/winAPI.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package exec
diff --git a/pkg/linuxContext.go b/pkg/linuxContext.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package pkg
diff --git a/pkg/manager.go b/pkg/manager.go
@@ -292,7 +292,7 @@ func (pm PackageTaskManager) run(
 	)
 
 	res.Output = stderrBuf.String() + stdoutBuf.String()
-	res.Pids = execCtx.Pids
+	res.Pid = execCtx.Pid
 
 	return nil
 }
diff --git a/pkg/windowsContext.go b/pkg/windowsContext.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package pkg
diff --git a/script/scriptRunner.go b/script/scriptRunner.go
@@ -3,6 +3,7 @@ package script
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -60,25 +61,26 @@ func (r Runner) Run(ctx context.Context, scripts tasks.Scripts, globalAbortOnErr
 
 			changeMap := make(map[string]string)
 
-			if !res.IsSkipped {
-				comment = `Command "` + name + `" run`
-				changeMap["pid"] = fmt.Sprintf("%d", res.Pid)
-				if runErr, ok := res.Err.(exec.RunError); ok {
-					changeMap["retcode"] = fmt.Sprintf("%d", runErr.ExitCode)
-				}
+			if cmdRunTask, ok := task.(*tasks.CmdRunTask); ok {
+				if !res.IsSkipped {
+					changeMap["pid"] = fmt.Sprintf("%d", res.Pid)
+					if runErr, ok := res.Err.(exec.RunError); ok {
+						changeMap["retcode"] = fmt.Sprintf("%d", runErr.ExitCode)
+					}
 
-				changeMap["stderr"] = strings.TrimSpace(strings.ReplaceAll(res.StdErr, "\r\n", "\n"))
-				changeMap["stdout"] = strings.TrimSpace(strings.ReplaceAll(res.StdOut, "\r\n", "\n"))
+					changeMap["stderr"] = strings.TrimSpace(strings.ReplaceAll(res.StdErr, "\r\n", "\n"))
+					changeMap["stdout"] = strings.TrimSpace(strings.ReplaceAll(res.StdOut, "\r\n", "\n"))
 
-				if exec.IsPowerShell(cmdRunTask.Shell) {
-					changeMap["stdout"] = powershellUnquote(changeMap["stdout"])
+					if exec.IsPowerShell(cmdRunTask.Shell) {
+						changeMap["stdout"] = powershellUnquote(changeMap["stdout"])
+					}
+					changes++
 				}
-				changes++
-			}
 
-			if cmdRunTask.AbortOnError && !res.Succeeded() {
-				abort = true
-				aborted = total - tasksRun
+				if cmdRunTask.AbortOnError && !res.Succeeded() {
+					abort = true
+					aborted = total - tasksRun
+				}
 			}
 
 			if len(res.Changes) > 0 {
diff --git a/tasks/pkgTask.go b/tasks/pkgTask.go
@@ -153,7 +153,7 @@ type PackageManagerExecutionResult struct {
 	Output  string
 	Comment string
 	Changes map[string]string
-	Pids    []int
+	Pid     int
 }
 
 type PackageManager interface {
@@ -205,7 +205,7 @@ func (pte *PkgTaskExecutor) Execute(ctx context.Context, task Task) ExecutionRes
 		execRes.StdOut = pkgExecResult.Output
 		execRes.Comment = pkgExecResult.Comment
 		execRes.Changes = pkgExecResult.Changes
-		execRes.Pids = pkgExecResult.Pids
+		execRes.Pid = pkgExecResult.Pid
 	}
 
 	execRes.IsSkipped = false
diff --git a/utils/lineSepNix.go b/utils/lineSepNix.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package utils
diff --git a/utils/lineSepWin.go b/utils/lineSepWin.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package utils
diff --git a/utils/osFilesWin.go b/utils/osFilesWin.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package utils

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build windows`
`1`	`2`	`// +build windows`
`2`	`3`
`3`	`4`	`package apptest`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build linux`
`1`	`2`	`// +build linux`
`2`	`3`
`3`	`4`	`package pkg`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ func (pm PackageTaskManager) run(`
`292`	`292`	`)`
`293`	`293`
`294`	`294`	`res.Output = stderrBuf.String() + stdoutBuf.String()`
`295`		`- res.Pids = execCtx.Pids`
	`295`	`+ res.Pid = execCtx.Pid`
`296`	`296`
`297`	`297`	`return nil`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !windows`
`1`	`2`	`// +build !windows`
`2`	`3`
`3`	`4`	`package utils`