sync: update CI config files (#229)

Co-authored-by: web3-bot <web3-bot@users.noreply.github.com>
Co-authored-by: Henrique Dias <hacdias@gmail.com>

.github/workflows/automerge.yml

@@ -1,53 +1,11 @@
 # File managed by web3-bot. DO NOT EDIT.
 # See https://github.com/protocol/.github/ for details.
 
-# Automatically merge pull requests opened by web3-bot, as soon as (and only if) all tests pass.
-# This reduces the friction associated with updating with our workflows.
-
-on: [ pull_request ]
 name: Automerge
+on: [ pull_request ]
 
 jobs:
- automerge-check:
- if: github.event.pull_request.user.login == 'web3-bot'
- runs-on: ubuntu-latest
- outputs:
- status: ${{ steps.should-automerge.outputs.status }}
- steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
- - name: Check if we should automerge
- id: should-automerge
- run: |
- for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
- committer=$(git show --format=$'%ce' -s $commit)
- echo "Committer: $committer"
- if [[ "$committer" != "web3-bot@users.noreply.github.com" ]]; then
- echo "Commit $commit wasn't committed by web3-bot, but by $committer."
- echo "::set-output name=status::false"
- exit
- fi
- done
- echo "::set-output name=status::true"
  automerge:
- needs: automerge-check
- runs-on: ubuntu-latest
- # The check for the user is redundant here, as this job depends on the automerge-check job,
- # but it prevents this job from spinning up, just to be skipped shortly after.
- if: github.event.pull_request.user.login == 'web3-bot' && needs.automerge-check.outputs.status == 'true'
- steps:
- - name: Wait on tests
- uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
- with:
- ref: ${{ github.event.pull_request.head.sha }}
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- wait-interval: 10
- running-workflow-name: 'automerge' # the name of this job
- - name: Merge PR
- uses: pascalgn/automerge-action@741c311a47881be9625932b0a0de1b0937aab1ae # v0.13.1
- env:
- GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- MERGE_LABELS: ""
- MERGE_METHOD: "squash"
- MERGE_DELETE_BRANCH: true
+ uses: protocol/.github/.github/workflows/automerge.yml@master
+ with:
+ job: 'automerge'

.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.17.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@c8caa92bad8c27ae734c6725b8a04932d54a147b # 2021.1.2 (v0.2.2)
+ 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/multiple-go-modules@v1.2
  with:
@@ -71,4 +71,3 @@ jobs:
  git status --short
  exit 1
  fi
-

.github/workflows/go-test.yml

@@ -10,16 +10,16 @@ jobs:
  fail-fast: false
  matrix:
  os: [ "ubuntu", "windows", "macos" ]
- go: [ "1.16.x", "1.17.x" ]
+ go: [ "1.18.x", "1.19.x" ]
  env:
  COVERAGES: ""
- runs-on: ${{ matrix.os }}-latest
- name: ${{ matrix.os}} (go ${{ matrix.go }})
+ 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,14 +43,16 @@ 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/multiple-go-modules@v1.2
  env:
  GOARCH: 386
  with:
- run: go test -v ./...
+ run: |
+ export "PATH=${{ env.PATH_386 }}:$PATH"
+ 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/multiple-go-modules@v1.2
@@ -60,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 }}

arguments_test.go

@@ -2,7 +2,7 @@ package cmds
 
 import (
  "bytes"
- "io/ioutil"
+ "io"
  "testing"
 )
 
@@ -75,7 +75,7 @@ func TestArguments(t *testing.T) {
 
  for i, tc := range testCases {
  for cut := 0; cut <= len(tc.arguments); cut++ {
- args := newArguments(ioutil.NopCloser(bytes.NewBufferString(tc.input)))
+ args := newArguments(io.NopCloser(bytes.NewBufferString(tc.input)))
  for j, arg := range tc.arguments[:cut] {
  if !args.Scan() {
  t.Errorf("in test case %d, missing argument %d", i, j)

cli/error_posix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package cli
 

cli/error_windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package cli
 

cli/helptext.go

@@ -46,6 +46,7 @@ type helpFields struct {
 
 // TrimNewlines removes extra newlines from fields. This makes aligning
 // commands easier. Below, the leading + tralining newlines are removed:
+//
 // Synopsis: `
 // ipfs config <key> - Get value of <key>
 // ipfs config <key> <value> - Set value of <key> to <value>
@@ -586,9 +587,7 @@ func (ls lengthSlice) Less(a, b int) bool {
 
 func sortByLength(slice []string) []string {
  output := make(lengthSlice, len(slice))
- for i, val := range slice {
- output[i] = val
- }
+ copy(output, slice)
  sort.Sort(output)
  return []string(output)
 }

cli/parse_test.go

@@ -4,7 +4,6 @@ import (
  "context"
  "fmt"
  "io"
- "io/ioutil"
  "net/url"
  "os"
  "path/filepath"
@@ -475,7 +474,7 @@ func TestBodyArgs(t *testing.T) {
 
  // Use a temp file to simulate stdin
  fileToSimulateStdin := func(t *testing.T, content string) *os.File {
- fstdin, err := ioutil.TempFile("", "")
+ fstdin, err := os.CreateTemp("", "")
  if err != nil {
  t.Fatal(err)
  }
@@ -742,7 +741,7 @@ func TestFileArgs(t *testing.T) {
  if pattern != "" {
  pat = pattern
  }
- tmpFile, err := ioutil.TempFile(dir, pat)
+ tmpFile, err := os.CreateTemp(dir, pat)
  if err != nil {
  t.Fatal(err)
  }
@@ -752,11 +751,11 @@ func TestFileArgs(t *testing.T) {
  }
  return tmpFile
  }
- tmpDir1, err := ioutil.TempDir("", "parsetest_fileargs_tmpdir_")
+ tmpDir1, err := os.MkdirTemp("", "parsetest_fileargs_tmpdir_")
  if err != nil {
  t.Fatal(err)
  }
- tmpDir2, err := ioutil.TempDir("", "parsetest_utildir_")
+ tmpDir2, err := os.MkdirTemp("", "parsetest_utildir_")
  if err != nil {
  t.Fatal(err)
  }

cli/responseemitter.go

@@ -7,7 +7,7 @@ import (
  "os"
  "sync"
 
- "github.com/ipfs/go-ipfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 var _ ResponseEmitter = &responseEmitter{}

cli/run.go

@@ -8,7 +8,7 @@ import (
  "strings"
  "time"
 
- "github.com/ipfs/go-ipfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 // ExitError is the error used when a specific exit code needs to be returned.

cli/run_test.go

@@ -6,7 +6,7 @@ import (
  "testing"
  "time"
 
- "github.com/ipfs/go-ipfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 var root = &cmds.Command{