Skip to content

Commit

Permalink
local rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
XSHui committed Feb 19, 2021
2 parents 0eed90b + 39532ee commit 8965594
Show file tree
Hide file tree
Showing 12 changed files with 537 additions and 201 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integrate-cluster-cmd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-cluster-scale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-dm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-playground.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16
id: go

- name: Check out code into the Go module directory
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integrate-tiup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -66,10 +66,10 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
path: go/src/github.com/${{ github.repository }}

- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16
id: go

- name: make unit-test
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/reprotest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
matrix:
go:
- 1.13
- 1.14
- 1.15
- 1.16

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
80 changes: 34 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,77 +6,65 @@ require (
github.com/AstroProfundis/sysinfo v0.0.0-20210201035811-eb96b87c86b3
github.com/AstroProfundis/tabby v1.1.1-color
github.com/BurntSushi/toml v0.3.1
github.com/ScaleFT/sshkeys v0.0.0-20181112160850-82451a803681
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38
github.com/appleboy/easyssh-proxy v1.3.7
github.com/asaskevich/EventBus v0.0.0-20180315140547-d46933a94f05
github.com/blevesearch/bleve v1.0.8-0.20200520165604-f0ded112bb1b
github.com/cavaliercoder/grab v2.0.1-0.20200331080741-9f014744ee41+incompatible
github.com/cheggaaa/pb v2.0.7+incompatible
github.com/appleboy/easyssh-proxy v1.3.8
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
github.com/blevesearch/bleve v1.0.14
github.com/cavaliercoder/grab v1.0.1-0.20201108051000-98a5bfe305ec
github.com/cheggaaa/pb/v3 v3.0.6
github.com/creasty/defaults v1.5.1
github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect
github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
github.com/fatih/color v1.10.0
github.com/gibson042/canonicaljson-go v1.0.3
github.com/gizak/termui/v3 v3.1.0
github.com/go-sql-driver/mysql v1.5.0
github.com/gofrs/flock v0.8.0
github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.4.2
github.com/google/uuid v1.1.4
github.com/gorilla/mux v1.7.4
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.4.3
github.com/google/uuid v1.2.0
github.com/gorilla/mux v1.8.0
github.com/jeremywohl/flatten v1.0.1
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/joomcode/errorx v1.0.1
github.com/joomcode/errorx v1.0.3
github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a
github.com/lunixbochs/vtclean v1.0.0 // indirect
github.com/magiconair/properties v1.8.1
github.com/magiconair/properties v1.8.4
github.com/markbates/pkger v0.17.1
github.com/mattn/go-runewidth v0.0.7
github.com/otiai10/copy v1.2.0
github.com/mattn/go-runewidth v0.0.10
github.com/otiai10/copy v1.4.2
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
github.com/pingcap/dm v1.1.0-alpha.0.20200521025928-83063141c5fd
github.com/pingcap/dm v1.1.0-alpha.0.20201127064547-e68f83cc9952
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
github.com/pingcap/fn v0.0.0-20200306044125-d5540d389059
github.com/pingcap/go-tpc v1.0.4-0.20201106030831-2cc8c0ab3409
github.com/pingcap/go-ycsb v0.0.0-20200226103513-00ca633a87d8
github.com/pingcap/kvproto v0.0.0-20201210033455-35030157bad5
github.com/pingcap/go-tpc v1.0.4
github.com/pingcap/go-ycsb v0.0.0-20210129115622-04d8656123e4
github.com/pingcap/kvproto v0.0.0-20201215060142-f3dafca4c7fd
github.com/pingcap/tidb-insight v0.3.2
github.com/prometheus/client_model v0.2.0
github.com/prometheus/prom2json v1.3.0
github.com/r3labs/diff v0.0.0-20201223155434-f54a0724e0a9
github.com/r3labs/diff v1.1.1-0.20201223155434-f54a0724e0a9
github.com/relex/aini v1.2.1
github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44
github.com/shirou/gopsutil v3.20.12+incompatible
github.com/sergi/go-diff v1.1.0
github.com/shirou/gopsutil v3.21.1+incompatible
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.1.1
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/tikv/pd v0.0.0-20210105064748-f4e7924b50b6
github.com/stretchr/testify v1.7.0
github.com/tikv/pd v1.1.0-beta.0.20210105064748-f4e7924b50b6
github.com/tj/go-termd v0.0.2-0.20200115111609-7f6aeb166380
github.com/xo/usql v0.7.8
go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
go.uber.org/atomic v1.7.0
go.uber.org/zap v1.16.0
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/mod v0.2.0
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
gopkg.in/VividCortex/ewma.v1 v1.1.1 // indirect
gopkg.in/cheggaaa/pb.v2 v2.0.7 // indirect
gopkg.in/fatih/color.v1 v1.7.0 // indirect
gopkg.in/ini.v1 v1.55.0
gopkg.in/mattn/go-colorable.v0 v0.1.0 // indirect
gopkg.in/mattn/go-isatty.v0 v0.0.4 // indirect
gopkg.in/mattn/go-runewidth.v0 v0.0.4 // indirect
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
software.sslmate.com/src/go-pkcs12 v0.0.0-20200619203921-c9ed90bd32dc
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/mod v0.4.1
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210218085108-9555bcde0c6a
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
gopkg.in/ini.v1 v1.62.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
software.sslmate.com/src/go-pkcs12 v0.0.0-20201103104416-57fc603b7f52
)

replace gopkg.in/yaml.v2 => github.com/july2993/yaml v0.0.0-20200423062752-adcfa5abe2ed
Loading

0 comments on commit 8965594

Please sign in to comment.