From 144752ab6426b20d92f080dcfdadee8dfe6551f6 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 2 Jun 2021 16:52:25 +0000 Subject: [PATCH 1/7] disable Travis --- .travis.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 936d6a4..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -os: - - linux - -language: go - -go: - - 1.14.x - -env: - global: - - GOTFLAGS="-race" - matrix: - - BUILD_DEPTYPE=gomod - - -# disable travis install -install: - - true - -script: - - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) - - -cache: - directories: - - $GOPATH/pkg/mod - - $HOME/.cache/go-build - -notifications: - email: false From 063a95ebce4414b16c1417b1394a88086227fcf2 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 2 Jun 2021 16:52:27 +0000 Subject: [PATCH 2/7] set Go version to 1.15 and run go mod tidy --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8736811..22f0347 100644 --- a/go.mod +++ b/go.mod @@ -6,4 +6,4 @@ require ( golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 ) -go 1.12 +go 1.15 From 53caa4d2dd24c14a16775daf9c3a11d84505f794 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 2 Jun 2021 16:52:28 +0000 Subject: [PATCH 3/7] add .github/workflows/automerge.yml --- .github/workflows/automerge.yml | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..32bcc2e --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,51 @@ +# 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 + +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 + if: ${{ 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 From f92e1b7fb70aca5bf51c2762ef41e3aa18e74c6f Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 2 Jun 2021 16:52:28 +0000 Subject: [PATCH 4/7] add .github/workflows/go-test.yml --- .github/workflows/go-test.yml | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/go-test.yml diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml new file mode 100644 index 0000000..4c7138b --- /dev/null +++ b/.github/workflows/go-test.yml @@ -0,0 +1,47 @@ +# File managed by web3-bot. DO NOT EDIT. +# See https://github.com/protocol/.github/ for details. + +on: [push, pull_request] +name: Go Test + +jobs: + unit: + strategy: + fail-fast: false + matrix: + os: [ "ubuntu", "windows", "macos" ] + go: [ "1.15.x", "1.16.x" ] + runs-on: ${{ matrix.os }}-latest + name: ${{ matrix.os}} (go ${{ matrix.go }}) + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.go }} + - name: Go information + run: | + go version + go env + - name: Run tests + uses: protocol/multiple-go-modules@v1.0 + with: + run: go test -v -coverprofile coverage.txt ./... + - name: Run tests (32 bit) + if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX. + uses: protocol/multiple-go-modules@v1.0 + env: + GOARCH: 386 + with: + run: 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.0 + with: + run: go test -v -race ./... + - name: Upload coverage to Codecov + uses: codecov/codecov-action@a1ed4b322b4b38cb846afb5a0ebfa17086917d27 # v1.5.0 + with: + file: coverage.txt + env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }} From 7e0b6b058a65ce21846cea23567769c4db9c5bc3 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 2 Jun 2021 16:52:28 +0000 Subject: [PATCH 5/7] add .github/workflows/go-check.yml --- .github/workflows/go-check.yml | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/go-check.yml diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml new file mode 100644 index 0000000..00ce947 --- /dev/null +++ b/.github/workflows/go-check.yml @@ -0,0 +1,50 @@ +# File managed by web3-bot. DO NOT EDIT. +# See https://github.com/protocol/.github/ for details. + +on: [push, pull_request] +name: Go Checks + +jobs: + unit: + runs-on: ubuntu-latest + name: All + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: actions/setup-go@v2 + with: + go-version: "1.16.x" + - name: Install staticcheck + run: go install honnef.co/go/tools/cmd/staticcheck@434f5f3816b358fe468fa83dcba62d794e7fe04b # 2021.1 (v0.2.0) + - name: Check that go.mod is tidy + uses: protocol/multiple-go-modules@v1.0 + with: + run: | + go mod tidy + if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then + echo "go.sum was added by go mod tidy" + exit 1 + fi + git diff --exit-code -- go.sum go.mod + - name: gofmt + if: ${{ success() || failure() }} # run this step even if the previous one failed + run: | + out=$(gofmt -s -l .) + if [[ -n "$out" ]]; then + echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}' + exit 1 + fi + - name: go vet + if: ${{ success() || failure() }} # run this step even if the previous one failed + uses: protocol/multiple-go-modules@v1.0 + with: + run: go vet ./... + - name: staticcheck + if: ${{ success() || failure() }} # run this step even if the previous one failed + uses: protocol/multiple-go-modules@v1.0 + with: + run: | + set -o pipefail + staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g' + From 73547d879f88980f233b3f929dbcaadabe233249 Mon Sep 17 00:00:00 2001 From: "Masih H. Derkani" Date: Thu, 22 Jul 2021 10:27:38 +0100 Subject: [PATCH 6/7] Mock `FileInfo.Sys()` to return `nil` explicitly Otherwise, this function call panics on windows. --- filter_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/filter_test.go b/filter_test.go index d33b114..ad2e48c 100644 --- a/filter_test.go +++ b/filter_test.go @@ -16,6 +16,10 @@ func (m *mockFileInfo) Name() string { return m.name } +func (m *mockFileInfo) Sys() interface{} { + return nil +} + var _ os.FileInfo = &mockFileInfo{} func TestFileFilter(t *testing.T) { From ac10fa80a51edc0f32e9aa0a72de9fed5292a1ce Mon Sep 17 00:00:00 2001 From: "Masih H. Derkani" Date: Thu, 22 Jul 2021 10:57:54 +0100 Subject: [PATCH 7/7] Normalize path separator in tests based in OS Use OS specific path separators in tests --- filewriter_test.go | 16 ++++++++-------- serialfile_test.go | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/filewriter_test.go b/filewriter_test.go index 5809aba..4d21503 100644 --- a/filewriter_test.go +++ b/filewriter_test.go @@ -24,20 +24,20 @@ func TestWriteTo(t *testing.T) { } defer os.RemoveAll(tmppath) - path := tmppath + "/output" + path := filepath.Join(tmppath, "output") err = WriteTo(sf, path) if err != nil { t.Fatal(err) } expected := map[string]string{ - ".": "", - "1": "Some text!\n", - "2": "beep", - "3": "", - "4": "boop", - "5": "", - "5/a": "foobar", + ".": "", + "1": "Some text!\n", + "2": "beep", + "3": "", + "4": "boop", + "5": "", + filepath.FromSlash("5/a"): "foobar", } err = filepath.Walk(path, func(cpath string, info os.FileInfo, err error) error { if err != nil { diff --git a/serialfile_test.go b/serialfile_test.go index ee8da3a..ae76396 100644 --- a/serialfile_test.go +++ b/serialfile_test.go @@ -29,17 +29,17 @@ func testSerialFile(t *testing.T, hidden, withIgnoreRules bool) { defer os.RemoveAll(tmppath) testInputs := map[string]string{ - "1": "Some text!\n", - "2": "beep", - "3": "", - "4": "boop", - "5": "", - "5/a": "foobar", - ".6": "thing", - "7": "", - "7/.foo": "bla", - ".8": "", - ".8/foo": "bla", + "1": "Some text!\n", + "2": "beep", + "3": "", + "4": "boop", + "5": "", + filepath.FromSlash("5/a"): "foobar", + ".6": "thing", + "7": "", + filepath.FromSlash("7/.foo"): "bla", + ".8": "", + filepath.FromSlash(".8/foo"): "bla", } fileFilter, err := NewFilter("", []string{"9", "10"}, hidden) if err != nil { @@ -47,9 +47,9 @@ func testSerialFile(t *testing.T, hidden, withIgnoreRules bool) { } if withIgnoreRules { testInputs["9"] = "" - testInputs["9/b"] = "bebop" + testInputs[filepath.FromSlash("9/b")] = "bebop" testInputs["10"] = "" - testInputs["10/.c"] = "doowop" + testInputs[filepath.FromSlash("10/.c")] = "doowop" } for p, c := range testInputs { @@ -76,7 +76,7 @@ func testSerialFile(t *testing.T, hidden, withIgnoreRules bool) { testInputs: for p := range testInputs { - components := strings.Split(p, "/") + components := strings.Split(p, string(filepath.Separator)) var stat os.FileInfo for i := range components { stat, err = os.Stat(filepath.Join(