Skip to content

Commit

Permalink
*: replace storage.Create by storage.New, upgrade dumpling CI to go 1…
Browse files Browse the repository at this point in the history
….16 (pingcap#286)
  • Loading branch information
lichunzhu authored Jun 2, 2021
1 parent a0cefba commit 148e1bd
Show file tree
Hide file tree
Showing 12 changed files with 142 additions and 537 deletions.
8 changes: 8 additions & 0 deletions dumpling/.github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 2
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.16
- name: Check
run: make check
- name: Unit test
Expand All @@ -32,6 +36,10 @@ jobs:
fail-fast: true
steps:
- uses: actions/checkout@v2
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.16
- name: Download dependencies
run: sh install.sh
- name: Start MySQL
Expand Down
4 changes: 2 additions & 2 deletions dumpling/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ your contribution accepted.

Developing Dumpling requires:

* [Go 1.13.5+](http://golang.org/doc/code.html)
* [Go 1.16+](http://golang.org/doc/code.html)
* An internet connection to download the dependencies

Simply run `make` to build the program.
Expand All @@ -28,7 +28,7 @@ See [README.md](README.md#building) for how to execute tests.

### Updating dependencies

Dumpling manages dependencies using [Go 1.13 module](https://github.com/golang/go/wiki/Modules).
Dumpling manages dependencies using [Go 1.16 module](https://github.com/golang/go/wiki/Modules).
To add or update a dependency, either

* Use the `go mod edit` command to change the dependency, or
Expand Down
1 change: 0 additions & 1 deletion dumpling/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ lint: tools
tidy:
@echo "go mod tidy"
GO111MODULE=on go mod tidy
cd tools && GO111MODULE=on go mod tidy
git diff --exit-code go.mod go.sum tools/go.mod tools/go.sum

bins:
Expand Down
2 changes: 1 addition & 1 deletion dumpling/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Any questions? Let's discuss in [#sig-migrate in Slack](https://slack.tidb.io/in
Building
--------

1. Install Go 1.13 or above
1. Install Go 1.16 or above
2. Run `make build` to compile. The output is in `bin/dumpling`.
3. Run `make test` to run the unit tests.
4. Run `make integration_test` to run integration tests. For integration test:
Expand Down
31 changes: 17 additions & 14 deletions dumpling/go.mod
Original file line number Diff line number Diff line change
@@ -1,37 +1,40 @@
module github.com/pingcap/dumpling

go 1.13
go 1.16

require (
github.com/DATA-DOG/go-sqlmock v1.4.1
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/docker/go-units v0.4.0
github.com/fsouza/fake-gcs-server v1.19.0 // indirect
github.com/go-sql-driver/mysql v1.5.0
github.com/golang/mock v1.4.4 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/onsi/ginkgo v1.11.0 // indirect
github.com/onsi/gomega v1.8.1 // indirect
github.com/pingcap/br v4.0.0-beta.2.0.20210203034957-7bc483ab69d5+incompatible
github.com/gorilla/websocket v1.4.1 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.14.3 // indirect
github.com/joho/sqltocsv v0.0.0-20210428211105-a6d6801d59df // indirect
github.com/pingcap/br v5.1.0-alpha.0.20210601094737-6cb0c4abc210+incompatible
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
github.com/pingcap/log v0.0.0-20201112100606-8f1e84a3abc8
github.com/pingcap/tidb v1.1.0-beta.0.20210129045644-ea6ccf82e934 // indirect
github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd
github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4
github.com/pingcap/tidb v1.1.0-beta.0.20210517044538-8ad868f801fc // indirect
github.com/pingcap/tidb-tools v4.0.9-0.20201127090955-2707c97b3853+incompatible
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/client_model v0.2.0
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/siddontang/go-log v0.0.0-20190221022429-1e957dd83bed // indirect
github.com/siddontang/go-mysql v0.0.0-20200222075837-12e89848f047
github.com/soheilhy/cmux v0.1.4
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/pflag v1.0.5
github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285 // indirect
github.com/tikv/pd v1.1.0-beta.0.20201125070607-d4b90eee0c70
github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d
github.com/xitongsys/parquet-go v1.6.0 // indirect
go.etcd.io/bbolt v1.3.5 // indirect
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
go.uber.org/zap v1.16.0
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 // indirect
golang.org/x/tools v0.0.0-20200823205832-c024452afbcd // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Loading

0 comments on commit 148e1bd

Please sign in to comment.