Merge pull request #886 from mackerelio/update-workflows

yseto · web-flow · commit 3dc1156beec4 · 2024-12-11T17:56:03.000+09:00
use mackerelio/workflows@v1.2.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,18 +12,18 @@ env:
   DEBIAN_FRONTEND: noninteractive
 jobs:
   lint:
-    uses: mackerelio/workflows/.github/workflows/go-lint.yml@v1.1.0
+    uses: mackerelio/workflows/.github/workflows/go-lint.yml@v1.2.0
   test:
-    uses: mackerelio/workflows/.github/workflows/go-test.yml@v1.1.0
+    uses: mackerelio/workflows/.github/workflows/go-test.yml@v1.2.0
   test-linux:
-    uses: mackerelio/workflows/.github/workflows/setup-go-matrix.yml@v1.1.0
+    uses: mackerelio/workflows/.github/workflows/setup-go-matrix.yml@v1.2.0
     with:
       run: |
         ./test.bash
         make testconvention
       os-versions: '["ubuntu-22.04"]'
   test-windows:
-    uses: mackerelio/workflows/.github/workflows/setup-go-matrix.yml@v1.1.0
+    uses: mackerelio/workflows/.github/workflows/setup-go-matrix.yml@v1.2.0
     with:
       run: |
         go build -o check-log/check-log.exe ./check-log
diff --git a/check-dns/lib/check_dns_test.go b/check-dns/lib/check_dns_test.go
@@ -13,12 +13,12 @@ import (
 func TestNameServer(t *testing.T) {
 	nameserver, err := adapterAddress()
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	}
-	t.Logf(nameserver)
+	t.Log(nameserver)
 	address := net.ParseIP(nameserver)
 	if address == nil {
-		t.Errorf("nameserver is invalid IP")
+		t.Error("nameserver is invalid IP")
 	}
 }
 
diff --git a/check-log/lib/check-log.go b/check-log/lib/check-log.go
@@ -290,7 +290,7 @@ func (opts *logOpts) searchLog(ctx context.Context, logFile string) (int64, int6
 	if opts.Encoding != "" {
 		e := encoding.GetEncoding(opts.Encoding)
 		if e == nil {
-			return 0, 0, "", fmt.Errorf("unknown encoding:" + opts.Encoding)
+			return 0, 0, "", fmt.Errorf("unknown encoding: %s", opts.Encoding)
 		}
 		opts.decoder = e.NewDecoder()
 	}
@@ -447,7 +447,7 @@ func parseFilePattern(directory, filePattern string, caseInsensitive bool) ([]st
 
 	fileInfos, err := os.ReadDir(dirStr)
 	if err != nil {
-		return nil, fmt.Errorf("cannot read the directory:" + err.Error())
+		return nil, fmt.Errorf("cannot read the directory: %s", err.Error())
 	}
 
 	var fileList []string
diff --git a/check-mysql/test_57/docker-compose.yml b/check-mysql/test_57/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   primary:
-    image: mysql:5.7.8
+    image: mysql:5.7.44
     platform: linux/amd64
     environment:
       MYSQL_ROOT_PASSWORD: mysql
@@ -17,7 +17,7 @@ services:
       - ./docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
 
   replica:
-    image: mysql:5.7.8
+    image: mysql:5.7.44
     platform: linux/amd64
     environment:
       MYSQL_ROOT_PASSWORD: mysql
diff --git a/check-mysql/test_57/test.sh b/check-mysql/test_57/test.sh
@@ -4,9 +4,9 @@ set -ex
 
 echo $0
 prog=$(basename $0)
-if ! command -v docker-compose > /dev/null
+if ! command -v docker > /dev/null
 then
-	echo "$prog: docker-compose is not installed" >&2
+	echo "$prog: docker is not installed" >&2
 	exit 2
 fi
 
@@ -28,8 +28,8 @@ if $plugin connection --host=127.0.0.1 --port=$primary_port --user=$user --passw
 	exit 1
 fi
 
-docker-compose up -d
-trap 'docker-compose down --rmi local -v' EXIT
+docker compose up -d
+trap 'docker compose down --rmi local -v' EXIT
 
 USER=$user PASSWORD=$password PORT=$primary_port ../wait.sh
 
diff --git a/check-mysql/test_8/docker-compose.yml b/check-mysql/test_8/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   primary:
-    image: mysql:8.0.23
+    image: mysql:8.0.40
     platform: linux/amd64
     environment:
       MYSQL_ROOT_PASSWORD: mysql
@@ -17,7 +17,7 @@ services:
       - ./docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
 
   replica:
-    image: mysql:8.0.23
+    image: mysql:8.0.40
     platform: linux/amd64
     environment:
       MYSQL_ROOT_PASSWORD: mysql
diff --git a/check-mysql/test_8/test.sh b/check-mysql/test_8/test.sh
@@ -4,9 +4,9 @@ set -ex
 
 echo $0
 prog=$(basename $0)
-if ! command -v docker-compose > /dev/null
+if ! command -v docker > /dev/null
 then
-	echo "$prog: docker-compose is not installed" >&2
+	echo "$prog: docker is not installed" >&2
 	exit 2
 fi
 
@@ -28,8 +28,8 @@ if $plugin connection --host=127.0.0.1 --port=$primary_port --user=$user --passw
 	exit 1
 fi
 
-docker-compose up -d
-trap 'docker-compose down --rmi local -v' EXIT
+docker compose up -d
+trap 'docker compose down --rmi local -v' EXIT
 
 USER=$user PASSWORD=$password PORT=$primary_port ../wait.sh
 
diff --git a/check-smtp/lib/check-smtp_test.go b/check-smtp/lib/check-smtp_test.go
@@ -39,7 +39,7 @@ func (m *mockSMTPServer) runServe() error {
 		tc := textproto.NewConn(conn)
 
 		for _, res := range m.responses {
-			if err := tc.PrintfLine(res); err != nil {
+			if err := tc.PrintfLine(res); err != nil { // nolint
 				errCh <- err
 				return
 			}
diff --git a/check-windows-eventlog/lib/check_windows_eventlog_test.go b/check-windows-eventlog/lib/check_windows_eventlog_test.go
@@ -48,6 +48,7 @@ func TestWriteLastOffset(t *testing.T) {
 }
 
 func raiseEvent(t *testing.T, typ int, msg string) {
+	t.Helper()
 	ole.CoInitialize(0)
 	defer ole.CoUninitialize()
 

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ import (`
`13`	`13`	`func TestNameServer(t *testing.T) {`
`14`	`14`	`nameserver, err := adapterAddress()`
`15`	`15`	`if err != nil {`
`16`		`- t.Errorf(err.Error())`
	`16`	`+ t.Error(err)`
`17`	`17`	`}`
`18`		`- t.Logf(nameserver)`
	`18`	`+ t.Log(nameserver)`
`19`	`19`	`address := net.ParseIP(nameserver)`
`20`	`20`	`if address == nil {`
`21`		`- t.Errorf("nameserver is invalid IP")`
	`21`	`+ t.Error("nameserver is invalid IP")`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ func (opts *logOpts) searchLog(ctx context.Context, logFile string) (int64, int6`
`290`	`290`	`if opts.Encoding != "" {`
`291`	`291`	`e := encoding.GetEncoding(opts.Encoding)`
`292`	`292`	`if e == nil {`
`293`		`- return 0, 0, "", fmt.Errorf("unknown encoding:" + opts.Encoding)`
	`293`	`+ return 0, 0, "", fmt.Errorf("unknown encoding: %s", opts.Encoding)`
`294`	`294`	`}`
`295`	`295`	`opts.decoder = e.NewDecoder()`
`296`	`296`	`}`
`@@ -447,7 +447,7 @@ func parseFilePattern(directory, filePattern string, caseInsensitive bool) ([]st`
`447`	`447`
`448`	`448`	`fileInfos, err := os.ReadDir(dirStr)`
`449`	`449`	`if err != nil {`
`450`		`- return nil, fmt.Errorf("cannot read the directory:" + err.Error())`
	`450`	`+ return nil, fmt.Errorf("cannot read the directory: %s", err.Error())`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`var fileList []string`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (m *mockSMTPServer) runServe() error {`
`39`	`39`	`tc := textproto.NewConn(conn)`
`40`	`40`
`41`	`41`	`for _, res := range m.responses {`
`42`		`- if err := tc.PrintfLine(res); err != nil {`
	`42`	`+ if err := tc.PrintfLine(res); err != nil { // nolint`
`43`	`43`	`errCh <- err`
`44`	`44`	`return`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ func TestWriteLastOffset(t *testing.T) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func raiseEvent(t *testing.T, typ int, msg string) {`
	`51`	`+ t.Helper()`
`51`	`52`	`ole.CoInitialize(0)`
`52`	`53`	`defer ole.CoUninitialize()`
`53`	`54`