Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use mackerelio/[email protected] #886

Merged
merged 5 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions check-dns/lib/check_dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down
4 changes: 2 additions & 2 deletions check-log/lib/check-log.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions check-mysql/test_57/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions check-mysql/test_57/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions check-mysql/test_8/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions check-mysql/test_8/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion check-smtp/lib/check-smtp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions check-windows-eventlog/lib/check_windows_eventlog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down