From 62a89399cba6479ae6e2965db4cca88a85304317 Mon Sep 17 00:00:00 2001 From: Aaron Hopkins Date: Tue, 28 Jun 2022 09:43:33 -0700 Subject: [PATCH 1/2] Fix small issues found by linters. --- frame.go | 2 +- video-to-jpg/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frame.go b/frame.go index 3cc60ef..07ad70a 100644 --- a/frame.go +++ b/frame.go @@ -58,7 +58,7 @@ func PixelListToFrame(px int, pl string) (Frame, error) { // Resize makes sure we have exactly num pixels. If not, repeat existing or // truncate. func (a Frame) Resize(num int) (Frame, error) { - if a == nil || len(a) == 0 { + if len(a) == 0 { return nil, ErrNoData } diff --git a/video-to-jpg/main.go b/video-to-jpg/main.go index e1d7eaa..a92f179 100644 --- a/video-to-jpg/main.go +++ b/video-to-jpg/main.go @@ -158,7 +158,7 @@ func writeJpeg(img image.Image, filename string) error { return err } - err = ioutil.WriteFile(filename, buf.Bytes(), 0644) + err = ioutil.WriteFile(filename, buf.Bytes(), 0o644) if err != nil { return err } From 267b1d7e013f2f32f03f7f3dfdbf530c695025ca Mon Sep 17 00:00:00 2001 From: Aaron Hopkins Date: Tue, 28 Jun 2022 09:43:47 -0700 Subject: [PATCH 2/2] Update Go versions we test against, update dependencies. --- .github/workflows/go-test.yml | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 1f6e7be..cf92c08 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - go: ['1.13', '1.14', '1.15', '1.16'] + go: ['1.15', '1.16', '1.17', '1.18'] steps: - uses: actions/setup-go@v2 diff --git a/go.mod b/go.mod index e0d8d75..afda7cb 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/die-net/led-controller -go 1.16 +go 1.15 require ( - github.com/gorilla/websocket v1.4.2 + github.com/gorilla/websocket v1.5.0 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect + golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect ) diff --git a/go.sum b/go.sum index 0a9189c..1eb1173 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=