sync: update CI config files (#87)

ipfs · Aug 25, 2022 · de3410b · de3410b
1 parent fc16ce3
commit de3410b
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 53 deletions.
diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml
@@ -11,12 +11,12 @@ jobs:
     env:
       RUNGOGENERATE: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.18.x"
+          go-version: "1.19.x"
       - name: Run repo-specific setup
         uses: ./.github/actions/go-check-setup
         if: hashFiles('./.github/actions/go-check-setup') != ''
@@ -27,7 +27,7 @@ jobs:
             echo "RUNGOGENERATE=true" >> $GITHUB_ENV
           fi
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@d7e217c1ff411395475b2971c0824e1e7cc1af98 # 2022.1 (v0.3.0)
+        run: go install honnef.co/go/tools/cmd/staticcheck@376210a89477dedbe6fdc4484b233998650d7b3c # 2022.1.3 (v0.3.3)
       - name: Check that go.mod is tidy
         uses: protocol/[email protected]
         with:

diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
@@ -10,16 +10,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu", "windows", "macos" ]
-        go: [ "1.17.x", "1.18.x" ]
+        go: [ "1.18.x", "1.19.x" ]
     env:
       COVERAGES: ""
     runs-on: ${{ format('{0}-latest', matrix.os) }}
     name: ${{ matrix.os }} (go ${{ matrix.go }})
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
       - name: Go information
@@ -43,7 +43,7 @@ jobs:
           # Use -coverpkg=./..., so that we include cross-package coverage.
           # If package ./A imports ./B, and ./A's tests also cover ./B,
           # this means ./B's coverage will be significantly higher than 0%.
-          run: go test -v -coverprofile=module-coverage.txt -coverpkg=./... ./...
+          run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./...
       - name: Run tests (32 bit)
         if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
         uses: protocol/[email protected]
@@ -52,7 +52,7 @@ jobs:
         with:
           run: |
             export "PATH=${{ env.PATH_386 }}:$PATH"
-            go test -v ./...
+            go test -v -shuffle=on ./...
       - name: Run tests with race detector
         if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
         uses: protocol/[email protected]
@@ -62,7 +62,7 @@ jobs:
         shell: bash
         run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
+        uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
         with:
           files: '${{ env.COVERAGES }}'
           env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}
diff --git a/block.go b/block.go
@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 

diff --git a/dht.go b/dht.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"

diff --git a/go.mod b/go.mod
@@ -63,4 +63,4 @@ require (
 	google.golang.org/protobuf v1.27.1 // indirect
 )
 
-go 1.17
+go 1.18
diff --git a/key.go b/key.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"

diff --git a/name.go b/name.go
@@ -3,6 +3,7 @@ package iface
 import (
 	"context"
 	"errors"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"

diff --git a/object.go b/object.go
@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"github.com/ipfs/go-cid"

diff --git a/options/key.go b/options/key.go
@@ -69,7 +69,7 @@ func (keyOpts) Type(algorithm string) KeyGenerateOption {
 // generated. Default is -1
 //
 // value of -1 means 'use default size for key type':
-//  * 2048 for RSA
+//   - 2048 for RSA
 func (keyOpts) Size(size int) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Size = size

diff --git a/options/name.go b/options/name.go
@@ -113,7 +113,6 @@ func (nameOpts) Cache(cache bool) NameResolveOption {
 	}
 }
 
-//
 func (nameOpts) ResolveOption(opt ropts.ResolveOpt) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.ResolveOpts = append(settings.ResolveOpts, opt)

diff --git a/options/pin.go b/options/pin.go
@@ -164,11 +164,11 @@ func (pinLsOpts) Indirect() PinLsOption {
 // type.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
 	switch typeStr {
 	case "all", "direct", "indirect", "recursive":
@@ -182,11 +182,11 @@ func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
 // be returned
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinLsOpts) pinType(t string) PinLsOption {
 	return func(settings *PinLsSettings) error {
 		settings.Type = t
@@ -224,11 +224,11 @@ func (pinIsPinnedOpts) Indirect() PinIsPinnedOption {
 // type.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
 	switch typeStr {
 	case "all", "direct", "indirect", "recursive":
@@ -242,11 +242,11 @@ func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
 // pin is expected to be, speeding up the research.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinIsPinnedOpts) pinType(t string) PinIsPinnedOption {
 	return func(settings *PinIsPinnedSettings) error {
 		settings.WithType = t

diff --git a/path/path.go b/path/path.go
@@ -15,7 +15,7 @@ import (
 // * /ipfs - Immutable unixfs path (files)
 // * /ipld - Immutable ipld path (data)
 // * /ipns - Mutable names. Usually resolves to one of the immutable paths
-//TODO: /local (MFS)
+// TODO: /local (MFS)
 type Path interface {
 	// String returns the path as a string.
 	String() string

diff --git a/pin.go b/pin.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"

diff --git a/tests/block.go b/tests/block.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"strings"
 	"testing"
 
@@ -211,7 +210,7 @@ func (tp *TestSuite) TestBlockGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	d, err := ioutil.ReadAll(r)
+	d, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -249,7 +248,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	d, err := ioutil.ReadAll(r)
+	d, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tests/dag.go b/tests/dag.go
@@ -2,12 +2,13 @@ package tests
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
 	gopath "path"
 	"strings"
 	"testing"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 
 	ipldcbor "github.com/ipfs/go-ipld-cbor"

diff --git a/tests/object.go b/tests/object.go
@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
@@ -143,7 +143,7 @@ func (tp *TestSuite) TestObjectData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -383,7 +383,7 @@ func (tp *TestSuite) TestObjectAddData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -416,7 +416,7 @@ func (tp *TestSuite) TestObjectSetData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tests/pin.go b/tests/pin.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/ipfs/interface-go-ipfs-core/path"
 

diff --git a/tests/pubsub.go b/tests/pubsub.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 

diff --git a/tests/unixfs.go b/tests/unixfs.go
@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"math/rand"
 	"os"
@@ -113,7 +112,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 		return path.IpfsPath(c)
 	}
 
-	rf, err := ioutil.TempFile(os.TempDir(), "unixfs-add-real")
+	rf, err := os.CreateTemp(os.TempDir(), "unixfs-add-real")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -134,7 +133,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 	defer os.Remove(rfp)
 
 	realFile := func() files.Node {
-		n, err := files.NewReaderPathFile(rfp, ioutil.NopCloser(strings.NewReader(helloStr)), stat)
+		n, err := files.NewReaderPathFile(rfp, io.NopCloser(strings.NewReader(helloStr)), stat)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -474,12 +473,12 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 					defer orig.Close()
 					defer got.Close()
 
-					do, err := ioutil.ReadAll(orig.(files.File))
+					do, err := io.ReadAll(orig.(files.File))
 					if err != nil {
 						t.Fatal(err)
 					}
 
-					dg, err := ioutil.ReadAll(got.(files.File))
+					dg, err := io.ReadAll(got.(files.File))
 					if err != nil {
 						t.Fatal(err)
 					}

diff --git a/unixfs.go b/unixfs.go
@@ -2,11 +2,12 @@ package iface
 
 import (
 	"context"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-files"
+	files "github.com/ipfs/go-ipfs-files"
 )
 
 type AddEvent struct {