Merge pull request #435 from gotestyourself/dnephin/update-ci

Remove old Go versions from CI

.circleci/config.yml

@@ -6,27 +6,6 @@ orbs:
 workflows:
   ci:
     jobs:
-      - go/test:
-          name: test-go-1.22
-          gotestsum-format: testname
-          executor:
-            name: go/golang
-            tag: 1.18-alpine
-
-      - go/test:
-          name: test-go-1.21
-          gotestsum-format: testname
-          executor:
-            name: go/golang
-            tag: 1.19-alpine
-
-      - go/test:
-          name: test-go-1.20
-          gotestsum-format: testname
-          executor:
-            name: go/golang
-            tag: 1.20-alpine
-
       - lint
       - build
 
@@ -72,7 +51,7 @@ jobs:
         default: false
     executor:
       name: go/golang
-      tag: 1.20-alpine
+      tag: 1.23-alpine
     steps:
       - go/install: {package: git}
       - go/install-ssh
@@ -99,7 +78,7 @@ jobs:
   lint:
     executor:
       name: go/golang
-      tag: 1.20-alpine
+      tag: 1.23-alpine
     steps:
       - checkout
       - run: go mod download
@@ -109,7 +88,7 @@ jobs:
             mkdir -p /go/bin
 
             download=https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh
-            wget -O- -q "$download" | sh -s -- -b /go/bin/ v1.51.1
+            wget -O- -q "$download" | sh -s -- -b /go/bin/ v1.60.3
       - run:
           name: Lint
           command: |

.project/golangci-lint.yml

@@ -16,39 +16,33 @@ issues:
       text: 'ST1000: at least one file in a package should have a package comment'
     - linters: [errcheck]
       text: 'Error return value of `.*\.WriteString` is not checked'
+    - linters: [errcheck]
+      text: 'Error return value of `fmt.Fprint.*` is not checked'
     - linters: [unparam]
       text: 'result .* is always'
     - linters: [unparam]
       text: 'always receives'
-    # Remove once go1.16 is dropped
-    - linters: staticcheck
-      text: 'env.Patch is deprecated'
 
 linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
-    - depguard
     - errcheck
     - goconst
     - gofmt
     - goimports
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - lll
     - misspell
     - nakedret
     - prealloc
     - revive
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace

cmd/handler_test.go

@@ -13,7 +13,6 @@ import (
 	"gotest.tools/gotestsum/testjson"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
-	"gotest.tools/v3/env"
 	"gotest.tools/v3/fs"
 	"gotest.tools/v3/golden"
 )
@@ -32,8 +31,8 @@ func TestPostRunHook(t *testing.T) {
 		stdout:               buf,
 	}
 
-	env.Patch(t, "GOTESTSUM_FORMAT", "short")
-	env.Patch(t, "GOTESTSUM_FORMAT_ICONS", "default")
+	t.Setenv("GOTESTSUM_FORMAT", "short")
+	t.Setenv("GOTESTSUM_FORMAT_ICONS", "default")
 
 	exec := newExecFromTestData(t)
 	err = postRunHook(opts, exec)

cmd/internal/signalhandlerdriver/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/signal"
 	"strconv"
@@ -17,7 +16,7 @@ func main() {
 	}
 
 	pid := []byte(strconv.Itoa(os.Getpid()))
-	if err := ioutil.WriteFile(os.Args[1], pid, 0644); err != nil {
+	if err := os.WriteFile(os.Args[1], pid, 0644); err != nil {
 		log("failed to write file:", err.Error())
 		os.Exit(1)
 	}

cmd/main_e2e_test.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -174,8 +173,7 @@ func compileBinary(t *testing.T) string {
 	}
 
 	binaryFixture.Do(func() string {
-		tmpDir, err := ioutil.TempDir("", "gotestsum-binary")
-		assert.NilError(t, err)
+		tmpDir := t.TempDir()
 
 		path := filepath.Join(tmpDir, "gotestsum")
 		result := icmd.RunCommand("go", "build", "-o", path, "..")

cmd/main_test.go

@@ -341,7 +341,7 @@ func TestRun_RerunFails_WithTooManyInitialFailures(t *testing.T) {
 {"Package": "pkg", "Action": "fail"}
 `
 
-	fn := func(args []string) *proc {
+	fn := func([]string) *proc {
 		return &proc{
 			cmd:    fakeWaiter{result: newExitCode("failed", 1)},
 			stdout: strings.NewReader(jsonFailed),
@@ -375,7 +375,7 @@ func TestRun_RerunFails_BuildErrorPreventsRerun(t *testing.T) {
 {"Package": "pkg", "Action": "fail"}
 `
 
-	fn := func(args []string) *proc {
+	fn := func([]string) *proc {
 		return &proc{
 			cmd:    fakeWaiter{result: newExitCode("failed", 1)},
 			stdout: strings.NewReader(jsonFailed),
@@ -411,7 +411,7 @@ func TestRun_RerunFails_PanicPreventsRerun(t *testing.T) {
 {"Package": "pkg", "Action": "fail"}
 `
 
-	fn := func(args []string) *proc {
+	fn := func([]string) *proc {
 		return &proc{
 			cmd:    fakeWaiter{result: newExitCode("failed", 1)},
 			stdout: strings.NewReader(jsonFailed),
@@ -479,7 +479,7 @@ func TestRun_JsonFileIsSyncedBeforePostRunCommand(t *testing.T) {
 
 	input := golden.Get(t, "../../testjson/testdata/input/go-test-json.out")
 
-	fn := func(args []string) *proc {
+	fn := func([]string) *proc {
 		return &proc{
 			cmd:    fakeWaiter{},
 			stdout: bytes.NewReader(input),
@@ -515,7 +515,7 @@ func TestRun_JsonFileIsSyncedBeforePostRunCommand(t *testing.T) {
 func TestRun_JsonFileTimingEvents(t *testing.T) {
 	input := golden.Get(t, "../../testjson/testdata/input/go-test-json.out")
 
-	fn := func(args []string) *proc {
+	fn := func([]string) *proc {
 		return &proc{
 			cmd:    fakeWaiter{},
 			stdout: bytes.NewReader(input),

cmd/rerunfails_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 	"testing"
 
@@ -31,7 +31,7 @@ func TestWriteRerunFailsReport(t *testing.T) {
 	err = writeRerunFailsReport(opts, exec)
 	assert.NilError(t, err)
 
-	raw, err := ioutil.ReadFile(reportFile.Path())
+	raw, err := os.ReadFile(reportFile.Path())
 	assert.NilError(t, err)
 	golden.Assert(t, string(raw), t.Name()+"-expected")
 }
@@ -53,7 +53,7 @@ func TestWriteRerunFailsReport_HandlesMissingActionRunEvents(t *testing.T) {
 	err = writeRerunFailsReport(opts, exec)
 	assert.NilError(t, err)
 
-	raw, err := ioutil.ReadFile(reportFile.Path())
+	raw, err := os.ReadFile(reportFile.Path())
 	assert.NilError(t, err)
 	golden.Assert(t, string(raw), t.Name()+"-expected")
 }
@@ -117,7 +117,7 @@ func TestRerunFailed_ReturnsAnErrorWhenTheLastTestIsSuccessful(t *testing.T) {
 		},
 	}
 
-	fn := func(args []string) *proc {
+	fn := func([]string) *proc {
 		next := events[0]
 		events = events[1:]
 		return &proc{
@@ -146,7 +146,7 @@ func TestRerunFailed_ReturnsAnErrorWhenTheLastTestIsSuccessful(t *testing.T) {
 
 func patchStartGoTestFn(f func(args []string) *proc) func() {
 	orig := startGoTestFn
-	startGoTestFn = func(ctx context.Context, dir string, args []string) (*proc, error) {
+	startGoTestFn = func(_ context.Context, _ string, args []string) (*proc, error) {
 		return f(args), nil
 	}
 	return func() {
@@ -190,7 +190,7 @@ func (e exitCodeError) ExitCode() int {
 }
 
 func newExitCode(msg string, code int) error {
-	return exitCodeError{error: fmt.Errorf(msg), code: code}
+	return exitCodeError{error: fmt.Errorf("%v", msg), code: code}
 }
 
 type noopHandler struct{}

cmd/testdata/e2e/flaky/flaky_test.go

@@ -1,10 +1,10 @@
+//go:build testdata
 // +build testdata
 
 package flaky
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"sync"
@@ -17,7 +17,7 @@ var once = new(sync.Once)
 
 func setup(t *testing.T) {
 	once.Do(func() {
-		raw, err := ioutil.ReadFile(seedfile)
+		raw, err := os.ReadFile(seedfile)
 		if err != nil {
 			t.Fatalf("failed to read seed: %v", err)
 		}
@@ -27,7 +27,7 @@ func setup(t *testing.T) {
 		}
 		seed = int(n)
 
-		err = ioutil.WriteFile(seedfile, []byte(strconv.Itoa(seed+1)), 0644)
+		err = os.WriteFile(seedfile, []byte(strconv.Itoa(seed+1)), 0644)
 		if err != nil {
 			t.Fatalf("failed to write seed: %v", err)
 		}

cmd/tool/slowest/slowest.go

@@ -3,7 +3,6 @@ package slowest
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"time"
 
@@ -139,7 +138,7 @@ func run(opts *options) error {
 func jsonfileReader(v string) (io.ReadCloser, error) {
 	switch v {
 	case "", "-":
-		return ioutil.NopCloser(os.Stdin), nil
+		return io.NopCloser(os.Stdin), nil
 	default:
 		return os.Open(v)
 	}

cmd/watch.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 
@@ -97,7 +96,7 @@ func runSingle(opts *options, dir string) (*testjson.Execution, error) {
 }
 
 func delveInitFile(exec *testjson.Execution) (string, func(), error) {
-	fh, err := ioutil.TempFile("", "gotestsum-delve-init")
+	fh, err := os.CreateTemp("", "gotestsum-delve-init")
 	if err != nil {
 		return "", nil, err
 	}

go.mod

@@ -1,17 +1,24 @@
 module gotest.tools/gotestsum
 
+go 1.21
+
 require (
 	github.com/bitfield/gotestdox v0.2.2
 	github.com/dnephin/pflag v1.0.7
 	github.com/fatih/color v1.17.0
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
-	golang.org/x/sync v0.7.0
+	golang.org/x/sync v0.8.0
 	golang.org/x/sys v0.25.0
 	golang.org/x/term v0.24.0
 	golang.org/x/tools v0.19.0
 	gotest.tools/v3 v3.5.1
 )
 
-go 1.13
+require (
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
+)