Merge pull request #31 from breml/update-github-actions

Update GitHub actions
breml · Aug 26, 2023 · b94114b · b94114b
2 parents 583b427 + aa51e63
commit b94114b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,24 +13,24 @@ jobs:
     name: ci
     runs-on: ubuntu-latest
     env:
-      GO_VERSION: "1.19"
-      GOLANGCI_LINT_VERSION: v1.45.2
+      GO_VERSION: "1.20"
+      GOLANGCI_LINT_VERSION: v1.52.2
       CGO_ENABLED: 0
 
     steps:
 
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml
@@ -17,20 +17,20 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ "1.19", "1.20", "1.x" ]
+        go-version: [ "1.20", "1.21", "1.x" ]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - name: Set up Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # In order:
           # * Module download cache

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,19 +12,19 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       -
         name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
 
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser
           version: latest

diff --git a/errchkjson.go b/errchkjson.go
@@ -308,14 +308,14 @@ func (e *errchkjson) inspectArgs(pass *analysis.Pass, args []ast.Expr) {
 }
 
 // Construct *types.Interface for interface encoding.TextMarshaler
-//     type TextMarshaler interface {
-//         MarshalText() (text []byte, err error)
-//     }
 //
+//	type TextMarshaler interface {
+//	    MarshalText() (text []byte, err error)
+//	}
 func textMarshalerInterface() *types.Interface {
 	textMarshalerInterface := types.NewInterfaceType([]*types.Func{
-		types.NewFunc(token.NoPos, nil, "MarshalText", types.NewSignature(
-			nil, nil, types.NewTuple(
+		types.NewFunc(token.NoPos, nil, "MarshalText", types.NewSignatureType(
+			nil, nil, nil, nil, types.NewTuple(
 				types.NewVar(token.NoPos, nil, "text",
 					types.NewSlice(
 						types.Universe.Lookup("byte").Type())),
@@ -328,14 +328,14 @@ func textMarshalerInterface() *types.Interface {
 }
 
 // Construct *types.Interface for interface json.Marshaler
-//     type Marshaler interface {
-//         MarshalJSON() ([]byte, error)
-//     }
 //
+//	type Marshaler interface {
+//	    MarshalJSON() ([]byte, error)
+//	}
 func jsonMarshalerInterface() *types.Interface {
 	textMarshalerInterface := types.NewInterfaceType([]*types.Func{
-		types.NewFunc(token.NoPos, nil, "MarshalJSON", types.NewSignature(
-			nil, nil, types.NewTuple(
+		types.NewFunc(token.NoPos, nil, "MarshalJSON", types.NewSignatureType(
+			nil, nil, nil, nil, types.NewTuple(
 				types.NewVar(token.NoPos, nil, "",
 					types.NewSlice(
 						types.Universe.Lookup("byte").Type())),

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/breml/errchkjson
 
-go 1.19
+go 1.20
 
 require golang.org/x/tools v0.12.0