Merge pull request #211 from dnephin/add-merge-main-workflow

Add github action for merging main branch
diff --git a/.github/workflows/sync-main.yaml b/.github/workflows/sync-main.yaml
new file mode 100644
index 0000000..3f052d0
--- /dev/null
+++ b/.github/workflows/sync-main.yaml
@@ -0,0 +1,18 @@
+name: Merge main into master
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  sync:
+    name: Merge main branch
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: {fetch-depth: 0}
+    - name: merge
+      run: |
+        git checkout master
+        git merge --ff-only main
+        git push origin master
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 64eb260..d157c77 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,21 +10,3 @@
 
 Pull requests for bug fixes are always appreciated. They should almost always
 include a test which fails without the bug fix.
-
-## Dependencies
-
-At this time both a `Gopkg.toml` for `dep` and `go.mod` for go modules exist in
-the repo. The `Gopkg.toml` remains so that projects using earlier versions of Go
-are able to find compatible versions of dependencies.
-
-If you need to make a change to a dependency:
-
-1. Update `Gopkg.toml`.
-2. Run the following to sync the changes to `go.mod`.
-   ```
-   dep ensure
-   rm go.mod go.sum
-   go mod init
-   gotestsum
-   go mod tidy
-   ```
diff --git a/Gopkg.toml b/Gopkg.toml
deleted file mode 100644
index c8394f3..0000000
--- a/Gopkg.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "0.8.0"
-
-[[constraint]]
-  name = "github.com/spf13/pflag"
-  version = "1.0.3"
-
-[[constraint]]
-  name = "github.com/google/go-cmp"
-  version = "0.4.0"
-
-[[constraint]]
-  # Commit a53bc13 dropped support for go1.8. Pinning the previous commit for
-  # now. We can remove this when we drop support for go1.8.
-  revision = "e96c4e24768da594adeb5eed27c8ecd547a3d4f1"
-  name = "golang.org/x/tools"
diff --git a/README.md b/README.md
index b63e8c0..f815716 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 A collection of packages to augment `testing` and support common patterns.
 
 [![GoDoc](https://godoc.org/gotest.tools?status.svg)](https://pkg.go.dev/gotest.tools/v3/?tab=subdirectories)
-[![CircleCI](https://circleci.com/gh/gotestyourself/gotest.tools/tree/master.svg?style=shield)](https://circleci.com/gh/gotestyourself/gotest.tools/tree/master)
+[![CircleCI](https://circleci.com/gh/gotestyourself/gotest.tools/tree/main.svg?style=shield)](https://circleci.com/gh/gotestyourself/gotest.tools/tree/main)
 [![Go Reportcard](https://goreportcard.com/badge/gotest.tools)](https://goreportcard.com/report/gotest.tools)
 
 ## Usage
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index cd4dafd..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: "{build}"
-image: Visual Studio 2017
-
-clone_folder: c:\project
-
-environment:
-  PATH: c:\go112\bin;%PATH%
-  GOROOT: c:\go112
-
-init:
-  - git config --global core.symlinks true
-
-install:
-  - go version
-  - go env
-
-deploy: false
-
-build_script:
-  - appveyor DownloadFile https://github.com/gotestyourself/gotestsum/releases/download/v0.3.5/gotestsum_0.3.5_windows_amd64.tar.gz
-  - tar -xzf gotestsum_0.3.5_windows_amd64.tar.gz
-  - go mod download
-
-test_script:
-  - gotestsum
diff --git a/dobi.yaml b/dobi.yaml
deleted file mode 100644
index bc62664..0000000
--- a/dobi.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-meta:
-  project: gotesttools
-
-mount=source:
-  bind: .
-  path: /go/src/gotest.tools
-
-mount=buildcache:
-  bind: ~/.cache/go-build
-  path: /root/.cache/go-build
-
-mount=modcache:
-  bind: ~/go/pkg/mod
-  path: /go/pkg/mod
-
-image=builder:
-  image: gotesttools-dev
-  context: .
-  target: dev
-  args:
-    GOLANG_VERSION: '{env.GOLANG_VERSION:}'
-
-job=shell:
-  use: builder
-  mounts: [source, buildcache, modcache]
-  interactive: true
-  command: sh
-
-job=watch:
-  use: builder
-  mounts: [source, buildcache, modcache]
-  interactive: true
-  command: |
-      filewatcher -x vendor gotestsum -- -test.timeout 10s
-  env:
-    - 'GOTESTSUM_FORMAT=short-verbose'
-    - 'GOTESTTOOLS_DEBUG={env.GOTESTTOOLS_DEBUG:}'
-
-job=test-unit:
-  use: builder
-  mounts: [source, buildcache, modcache]
-  interactive: true
-  command: scripts/test-unit
-
-job=deps:
-  use: builder
-  mounts: [source, buildcache, modcache]
-  command: dep ensure
-
-job=lint:
-  use: builder
-  mounts: [source, buildcache, modcache]
-  command: golangci-lint run
-
-alias=test:
-  tasks: [test-unit]