From d0fd330ba116f583cb6be2e07165ceb2177bfce5 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:54 +0000 Subject: [PATCH 01/10] disable Travis --- .travis.yml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 62bc4703b..000000000 --- a/.travis.yml +++ /dev/null @@ -1,43 +0,0 @@ -os: - - linux - -language: go - -go: - - 1.13.x - -services: - - docker - -env: - global: - - GO111MODULE=on - - GOTFLAGS="-race" - - IPFS_PATH=/tmp/ipfs - matrix: - - BUILD_DEPTYPE=gomod - -before_install: - - docker pull ipfs/go-ipfs:master - - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs - - docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master "daemon" "--enable-namesys-pubsub" - -install: - - go mod download - -before_script: - - go vet ./... - -script: - - go get -d github.com/cheekybits/is/... # remove with gx - - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) - - -cache: - directories: - - $GOPATH/src/gx - - $GOPATH/pkg/mod - - $HOME/.cache/go-build - -notifications: - email: false From 75eb3b66a5f42f06da16055efb9b1cc452679d5c Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:54 +0000 Subject: [PATCH 02/10] remove .gx --- .gx/lastpubver | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gx/lastpubver diff --git a/.gx/lastpubver b/.gx/lastpubver deleted file mode 100644 index 640626b78..000000000 --- a/.gx/lastpubver +++ /dev/null @@ -1 +0,0 @@ -1.4.8: QmSM3chHm3ZggBZsY2BuJbvpD9VF2mzdgR5JBQ78KnsbDw From e948d2c4d5d2605d0615ad071c90090e476d2161 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:56 +0000 Subject: [PATCH 03/10] bump go.mod to Go 1.16 and run go fix --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8e0964c5f..48efd9859 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -go 1.13 +go 1.16 module github.com/ipfs/go-ipfs-api From 6861b915e7602f0d0efb0883c9ac99e310b7d67f Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:57 +0000 Subject: [PATCH 04/10] run go mod tidy --- go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/go.sum b/go.sum index 372909f9c..6ea9b8c25 100644 --- a/go.sum +++ b/go.sum @@ -135,7 +135,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= From b8257fbe9ad8ae6799035ed260389a991128cd12 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:58 +0000 Subject: [PATCH 05/10] add .github/workflows/automerge.yml --- .github/workflows/automerge.yml | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 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 000000000..44fad65fc --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,53 @@ +# 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 + # 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 From c5e28f0219539f444cc7a13a722193e1fef47ef1 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:58 +0000 Subject: [PATCH 06/10] add .github/workflows/go-test.yml --- .github/workflows/go-test.yml | 55 +++++++++++++++++++++++++++++++++++ 1 file changed, 55 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 000000000..7010dccec --- /dev/null +++ b/.github/workflows/go-test.yml @@ -0,0 +1,55 @@ +# 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.16.x", "1.17.x" ] + env: + COVERAGES: "" + 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 repo-specific setup + uses: ./.github/actions/go-test-setup + if: hashFiles('./.github/actions/go-test-setup') != '' + - name: Run tests + uses: protocol/multiple-go-modules@v1.2 + with: + run: go test -v -coverprofile module-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.2 + 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.2 + with: + run: go test -v -race ./... + - name: Collect coverage files + 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@51d810878be5422784e86451c0e7c14e5860ec47 # v2.0.2 + with: + files: '${{ env.COVERAGES }}' + env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }} From 968adaccfbc5de4cfb6c37143257cfad529591bd Mon Sep 17 00:00:00 2001 From: web3-bot Date: Wed, 15 Sep 2021 22:19:58 +0000 Subject: [PATCH 07/10] add .github/workflows/go-check.yml --- .github/workflows/go-check.yml | 74 ++++++++++++++++++++++++++++++++++ 1 file changed, 74 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 000000000..6acdd48f9 --- /dev/null +++ b/.github/workflows/go-check.yml @@ -0,0 +1,74 @@ +# 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 + env: + RUNGOGENERATE: false + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: actions/setup-go@v2 + with: + go-version: "1.17.x" + - name: Run repo-specific setup + uses: ./.github/actions/go-check-setup + if: hashFiles('./.github/actions/go-check-setup') != '' + - name: Read config + if: hashFiles('./.github/workflows/go-check-config.json') != '' + run: | + if jq -re .gogenerate ./.github/workflows/go-check-config.json; then + echo "RUNGOGENERATE=true" >> $GITHUB_ENV + fi + - name: Install staticcheck + run: go install honnef.co/go/tools/cmd/staticcheck@df71e5d0e0ed317ebf43e6e59cf919430fa4b8f2 # 2021.1.1 (v0.2.1) + - name: Check that go.mod is tidy + uses: protocol/multiple-go-modules@v1.2 + 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.2 + with: + run: go vet ./... + - name: staticcheck + if: ${{ success() || failure() }} # run this step even if the previous one failed + uses: protocol/multiple-go-modules@v1.2 + with: + run: | + set -o pipefail + staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g' + - name: go generate + uses: protocol/multiple-go-modules@v1.2 + if: (success() || failure()) && env.RUNGOGENERATE == 'true' + with: + run: | + git clean -fd # make sure there aren't untracked files / directories + go generate ./... + # check if go generate modified or added any files + if ! $(git add . && git diff-index HEAD --exit-code --quiet); then + echo "go generated caused changes to the repository:" + git status --short + exit 1 + fi + From 10c76d2038076ebd049c70fc129a71d5c9bafd2a Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Thu, 16 Sep 2021 22:49:57 -0400 Subject: [PATCH 08/10] add CI action for installing, initializing, and running go-ipfs --- .github/actions/go-test-setup/action.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/actions/go-test-setup/action.yml diff --git a/.github/actions/go-test-setup/action.yml b/.github/actions/go-test-setup/action.yml new file mode 100644 index 000000000..cc5b02c95 --- /dev/null +++ b/.github/actions/go-test-setup/action.yml @@ -0,0 +1,15 @@ +name: installipfs +description: install go-ipfs + +runs: + using: "composite" + steps: + - name: Install go-ipfs + shell: bash + run: (cd /tmp && go install github.com/ipfs/go-ipfs/cmd/ipfs@master) + - name: Initialize go-ipfs + shell: bash + run: (ipfs init) + - name: Run go-ipfs + shell: bash + run: (ipfs daemon --enable-pubsub-experiment &) \ No newline at end of file From 46bd524ef7cf0da325eaf194dfcd224b17d8927d Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Fri, 17 Sep 2021 12:17:20 -0400 Subject: [PATCH 09/10] prevent testdata from having its line endings converted on Windows --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..cb95ad638 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# To prevent CRLF breakages on Windows for fragile files, like testdata. +testdata/* -text \ No newline at end of file From d1e044d7b035dc8bc3948abc0da97704a695ecea Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Fri, 17 Sep 2021 02:42:30 -0400 Subject: [PATCH 10/10] testing: check MFS testdata CID in TestMain --- mfs_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mfs_test.go b/mfs_test.go index fa2d33e28..bb1cf7326 100644 --- a/mfs_test.go +++ b/mfs_test.go @@ -28,6 +28,18 @@ func TestMain(m *testing.M) { } } + stat, err := s.FilesStat(context.Background(), "/testdata") + if err != nil { + fmt.Fprintf(os.Stderr, "Failed to stat test data, not running tests: %v\n", err) + os.Exit(1) + } + + expectedTestdataCIDString := "QmfZtacPc5nch976ZsiBw6nhLmTzy5JjW2pzZg8j7GjqWq" + if stat.Hash != expectedTestdataCIDString { + fmt.Fprintf(os.Stderr, "CID of /testdata is %s which does not match the expected %s, not running tests\n", stat.Hash, expectedTestdataCIDString) + os.Exit(1) + } + exitVal := m.Run() if err := s.FilesRm(context.Background(), "/testdata", true); err != nil { fmt.Fprintf(os.Stderr, "Failed to remove test data: %v\n", err)