Merge pull request #5 from cybozu/update-dependency

Author: 012xx

.github/workflows/lint_and_tests.yml

@@ -5,16 +5,16 @@ on:
   push:
 
 env:
-  go-version: 1.18
+  go-version: 1.24
 
 jobs:
   unit-test:
     timeout-minutes: 20
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.go-version }}
 

Makefile

@@ -1,8 +1,8 @@
 GIT := git
 PRE_COMMIT := pre-commit
 
-JSONNET_VERSION := v0.18.0
-GOLANGCI_VERSION := v1.46.2
+JSONNET_VERSION := v0.20.0
+GOLANGCI_VERSION := v1.64.6
 
 VERSION := v0.3.0
 

go.mod

@@ -1,9 +1,9 @@
 module github.com/cybozu/pre-commit-jsonnet
 
-go 1.18
+go 1.24
 
 require golang.org/x/exp v0.0.0-20220428152302-39d4317da171
 
-require github.com/sergi/go-diff v1.2.0
+require github.com/sergi/go-diff v1.3.1
 
-require golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6
+require golang.org/x/sys v0.31.0

go.sum

@@ -6,17 +6,17 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
-github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 golang.org/x/exp v0.0.0-20220428152302-39d4317da171 h1:TfdoLivD44QwvssI9Sv1xwa5DcL5XQr4au4sZ2F2NV4=
 golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

hooks/jsonnet-fmt-hook/main.go

@@ -8,8 +8,6 @@ import (
 	"regexp"
 	"strings"
 
-	"io/ioutil"
-
 	"golang.org/x/sys/execabs"
 
 	"github.com/cybozu/pre-commit-jsonnet/lib"
@@ -157,7 +155,7 @@ func diffJsonnetFmt(f string) (*FileDiff, error) {
 		return nil, fmtError
 	}
 
-	b, err := ioutil.ReadFile(f)
+	b, err := os.ReadFile(f)
 	if err != nil {
 		return nil, err
 	}

hooks/jsonnet-lint-hook/main_test.go

@@ -52,7 +52,8 @@ func TestExecJsonnetLint(t *testing.T) {
 			continue
 		}
 
-		if !errors.As(err, &param.wantErr) {
+		var lintErr *LintError
+		if !errors.As(err, &lintErr) {
 			t.Errorf("args='%q %q', want=%q, got=%q", param.f, param.opts, param.wantErr, err)
 		}
 	}