Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Commit 292cbe6

Browse files
authored
*: replace storage.Create by storage.New, upgrade dumpling CI to go 1.16 (#286)
1 parent be441d7 commit 292cbe6

File tree

12 files changed

+142
-537
lines changed

12 files changed

+142
-537
lines changed

.github/workflows/go.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
- uses: actions/checkout@v2
2020
with:
2121
fetch-depth: 2
22+
- name: Set up Go 1.16
23+
uses: actions/setup-go@v2
24+
with:
25+
go-version: 1.16
2226
- name: Check
2327
run: make check
2428
- name: Unit test
@@ -32,6 +36,10 @@ jobs:
3236
fail-fast: true
3337
steps:
3438
- uses: actions/checkout@v2
39+
- name: Set up Go 1.16
40+
uses: actions/setup-go@v2
41+
with:
42+
go-version: 1.16
3543
- name: Download dependencies
3644
run: sh install.sh
3745
- name: Start MySQL

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ your contribution accepted.
1414

1515
Developing Dumpling requires:
1616

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

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

2929
### Updating dependencies
3030

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

3434
* Use the `go mod edit` command to change the dependency, or

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ lint: tools
112112
tidy:
113113
@echo "go mod tidy"
114114
GO111MODULE=on go mod tidy
115-
cd tools && GO111MODULE=on go mod tidy
116115
git diff --exit-code go.mod go.sum tools/go.mod tools/go.sum
117116

118117
bins:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Any questions? Let's discuss in [#sig-migrate in Slack](https://slack.tidb.io/in
2929
Building
3030
--------
3131

32-
1. Install Go 1.13 or above
32+
1. Install Go 1.16 or above
3333
2. Run `make build` to compile. The output is in `bin/dumpling`.
3434
3. Run `make test` to run the unit tests.
3535
4. Run `make integration_test` to run integration tests. For integration test:

go.mod

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
11
module github.com/pingcap/dumpling
22

3-
go 1.13
3+
go 1.16
44

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

0 commit comments

Comments
 (0)