Merge pull request ipfs#70 from ipfs/web3-bot/sync

sync: update CI config files

.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

.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'
+

.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 }}

dagutils/diff.go

@@ -176,24 +176,28 @@ type Conflict struct {
 // Changes involved (which share the same path).
 func MergeDiffs(a, b []*Change) ([]*Change, []Conflict) {
 	paths := make(map[string]*Change)
-	for _, c := range a {
+	for _, c := range b {
 		paths[c.Path] = c
 	}
 
 	var changes []*Change
 	var conflicts []Conflict
 
-	for _, changeB := range b {
-		if changeA, ok := paths[changeB.Path]; ok {
+	// NOTE: we avoid iterating over maps here to ensure iteration order is determistic. We
+	// include changes from a first, then b.
+	for _, changeA := range a {
+		if changeB, ok := paths[changeA.Path]; ok {
 			conflicts = append(conflicts, Conflict{changeA, changeB})
 		} else {
-			changes = append(changes, changeB)
+			changes = append(changes, changeA)
 		}
-		delete(paths, changeB.Path)
+		delete(paths, changeA.Path)
 	}
 
-	for _, c := range paths {
-		changes = append(changes, c)
+	for _, c := range b {
+		if _, ok := paths[c.Path]; ok {
+			changes = append(changes, c)
+		}
 	}
 
 	return changes, conflicts

dagutils/diff_test.go

@@ -33,9 +33,9 @@ func TestMergeDiffs(t *testing.T) {
 	}
 
 	expect := []*Change{
-		changesB[1],
 		changesA[0],
 		changesA[2],
+		changesB[1],
 	}
 
 	for i, change := range changes {

dagutils/diffenum_test.go

@@ -46,61 +46,61 @@ func mkGraph(desc map[string]ndesc) map[string]ipld.Node {
 }
 
 var tg1 = map[string]ndesc{
-	"a1": ndesc{
+	"a1": {
 		"foo": "b",
 	},
-	"b": ndesc{},
-	"a2": ndesc{
+	"b": {},
+	"a2": {
 		"foo": "b",
 		"bar": "c",
 	},
-	"c": ndesc{},
+	"c": {},
 }
 
 var tg2 = map[string]ndesc{
-	"a1": ndesc{
+	"a1": {
 		"foo": "b",
 	},
-	"b": ndesc{},
-	"a2": ndesc{
+	"b": {},
+	"a2": {
 		"foo": "b",
 		"bar": "c",
 	},
-	"c": ndesc{"baz": "d"},
-	"d": ndesc{},
+	"c": {"baz": "d"},
+	"d": {},
 }
 
 var tg3 = map[string]ndesc{
-	"a1": ndesc{
+	"a1": {
 		"foo": "b",
 		"bar": "c",
 	},
-	"b": ndesc{},
-	"a2": ndesc{
+	"b": {},
+	"a2": {
 		"foo": "b",
 		"bar": "d",
 	},
-	"c": ndesc{},
-	"d": ndesc{},
+	"c": {},
+	"d": {},
 }
 
 var tg4 = map[string]ndesc{
-	"a1": ndesc{
+	"a1": {
 		"key1": "b",
 		"key2": "c",
 	},
-	"a2": ndesc{
+	"a2": {
 		"key1": "b",
 		"key2": "d",
 	},
 }
 
 var tg5 = map[string]ndesc{
-	"a1": ndesc{
+	"a1": {
 		"key1": "a",
 		"key2": "b",
 	},
-	"a2": ndesc{
+	"a2": {
 		"key1": "c",
 		"key2": "d",
 	},

go.mod

@@ -2,16 +2,16 @@ module github.com/ipfs/go-merkledag
 
 require (
 	github.com/gogo/protobuf v1.3.2
-	github.com/ipfs/go-block-format v0.0.2
-	github.com/ipfs/go-blockservice v0.1.0
-	github.com/ipfs/go-cid v0.0.3
-	github.com/ipfs/go-datastore v0.3.1
-	github.com/ipfs/go-ipfs-blockstore v0.1.0
+	github.com/ipfs/go-block-format v0.0.3
+	github.com/ipfs/go-blockservice v0.1.5
+	github.com/ipfs/go-cid v0.0.7
+	github.com/ipfs/go-datastore v0.4.5
+	github.com/ipfs/go-ipfs-blockstore v1.0.3
 	github.com/ipfs/go-ipfs-exchange-offline v0.0.1
-	github.com/ipfs/go-ipfs-util v0.0.1
-	github.com/ipfs/go-ipld-cbor v0.0.3
-	github.com/ipfs/go-ipld-format v0.0.2
-	github.com/multiformats/go-multihash v0.0.10
+	github.com/ipfs/go-ipfs-util v0.0.2
+	github.com/ipfs/go-ipld-cbor v0.0.5
+	github.com/ipfs/go-ipld-format v0.2.0
+	github.com/multiformats/go-multihash v0.0.15
 )
 
-go 1.12
+go 1.15