From a068753d490ae375c1ea16b3948c9bffb352ade7 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 4 Apr 2022 14:14:00 +0000 Subject: [PATCH 1/7] bump go.mod to Go 1.17 and run go fix --- go.mod | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ab2dfde..36dc873 100644 --- a/go.mod +++ b/go.mod @@ -6,4 +6,15 @@ require ( github.com/multiformats/go-multihash v0.0.13 ) -go 1.16 +require ( + github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect + github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 // indirect + github.com/mr-tron/base58 v1.1.3 // indirect + github.com/multiformats/go-base32 v0.0.3 // indirect + github.com/multiformats/go-varint v0.0.5 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect + golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect + golang.org/x/sys v0.0.0-20190412213103-97732733099d // indirect +) + +go 1.17 From cf6096c8b9ef576a9fd795b5883d0848774a59a9 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 4 Apr 2022 14:14:00 +0000 Subject: [PATCH 2/7] update .github/workflows/automerge.yml --- .github/workflows/automerge.yml | 50 +++------------------------------ 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 44fad65..3833fc2 100644 --- a/.github/workflows/automerge.yml +++ b/.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' From c7315a2ce25d60ee8dc94b3ccd139654d85c1a88 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 4 Apr 2022 14:14:00 +0000 Subject: [PATCH 3/7] update .github/workflows/go-test.yml --- .github/workflows/go-test.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 606e0c7..b86241a 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -10,11 +10,11 @@ jobs: fail-fast: false matrix: os: [ "ubuntu", "windows", "macos" ] - go: [ "1.16.x", "1.17.x" ] + go: [ "1.17.x", "1.18.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 with: @@ -50,7 +50,9 @@ jobs: env: GOARCH: 386 with: - run: go test -v ./... + run: | + export "PATH=${{ env.PATH_386 }}:$PATH" + go test -v ./... - 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 From 333bd5164a396972b74e63baafc8d288afe1807e Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 4 Apr 2022 14:14:00 +0000 Subject: [PATCH 4/7] update .github/workflows/go-check.yml --- .github/workflows/go-check.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml index e127cf1..25e1afd 100644 --- a/.github/workflows/go-check.yml +++ b/.github/workflows/go-check.yml @@ -16,7 +16,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v2 with: - go-version: "1.17.x" + go-version: "1.18.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@d7e217c1ff411395475b2971c0824e1e7cc1af98 # 2022.1 (v0.3.0) - 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 - From 186f083d6087b1155c720014773ca8e3a86837a9 Mon Sep 17 00:00:00 2001 From: Piotr Galar Date: Wed, 6 Apr 2022 15:13:08 +0200 Subject: [PATCH 5/7] fix: Unnecessarily complex way of printing formatted string and this value of cid is never used --- cid-fmt/main_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cid-fmt/main_test.go b/cid-fmt/main_test.go index 5609cd2..f20dbe5 100644 --- a/cid-fmt/main_test.go +++ b/cid-fmt/main_test.go @@ -27,7 +27,7 @@ func TestCidConv(t *testing.T) { } cidStr := cid.String() if cidStr != cidv0 { - t.Error(fmt.Sprintf("conversion failure, expected: %s; but got: %s", cidv0, cidStr)) + t.Errorf("conversion failure, expected: %s; but got: %s", cidv0, cidStr) } } @@ -38,7 +38,7 @@ func TestBadCidConv(t *testing.T) { if err != nil { t.Fatal(err) } - cid, err = toCidV0(cid) + _, err = toCidV0(cid) if err == nil { t.Fatal("expected failure") } From c465769e720659929386c2d3a2a217a53f5da134 Mon Sep 17 00:00:00 2001 From: Piotr Galar Date: Wed, 6 Apr 2022 15:13:46 +0200 Subject: [PATCH 6/7] fix: Unnecessarily complex way of printing formatted string --- format_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/format_test.go b/format_test.go index 7bbefe9..5389b03 100644 --- a/format_test.go +++ b/format_test.go @@ -69,7 +69,7 @@ func testFmt(t *testing.T, cidStr string, newBase mb.Encoding, fmtStr string, re t.Fatal(err) } if str != result { - t.Error(fmt.Sprintf("expected: %s; but got: %s", result, str)) + t.Errorf("expected: %s; but got: %s", result, str) } } From 9439a4740b1204250f14cec87d07646ab05819a8 Mon Sep 17 00:00:00 2001 From: Piotr Galar Date: Wed, 6 Apr 2022 15:18:09 +0200 Subject: [PATCH 7/7] fix: imported and not used: "fmt" --- cid-fmt/main_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cid-fmt/main_test.go b/cid-fmt/main_test.go index f20dbe5..6936d98 100644 --- a/cid-fmt/main_test.go +++ b/cid-fmt/main_test.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "testing" c "github.com/ipfs/go-cid"