Skip to content

Commit 353983f

Browse files
huyujiehuyujie
authored
Merge pull request #170 from tcchend/convert-govendor-to-go-mod
Convert govendor to go mod
2 parents e4b58b4 + 9722127 commit 353983f

File tree

539 files changed

+54
-197303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+54
-197303
lines changed

‎.travis.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ services:
55

66
language: go
77
go:
8-
- 1.11
8+
- 1.13
99

1010
env:
1111
matrix:
12-
- GO_VERSION=1.11
13-
- GO_VERSION=1.10
14-
- GO_VERSION=1.9
12+
- GO_VERSION=1.13
1513

1614
cache:
1715
directories:

‎Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ all: check build unit release
3535
check: vet lint
3636

3737
vet:
38-
@echo "go tool vet, skipping vendor packages"
39-
@go tool vet -all ${DIRS_TO_CHECK}
38+
@echo "go vet"
39+
@for i in $DIRS_TO_CHECK; do go vet ./$i;done
4040
@echo "ok"
4141

4242
lint:
@@ -98,25 +98,25 @@ unit-race:
9898
go test -v -race -cpu=1,2,4 ${PKGS_TO_CHECK}
9999
@echo "ok"
100100

101-
unit-runtime: unit-runtime-go-1.9 unit-runtime-go-1.10 unit-runtime-go-1.11
101+
unit-runtime: unit-runtime-go-1.13
102102

103-
export define DOCKERFILE_GO_1_11
104-
FROM golang:1.11
103+
export define DOCKERFILE_GO_1_13
104+
FROM golang:1.13
105105

106106
ADD . /go/src/github.com/yunify/qingcloud-sdk-go
107107
WORKDIR /go/src/github.com/yunify/qingcloud-sdk-go
108108

109109
CMD ["make", "build", "unit"]
110110
endef
111111

112-
unit-runtime-go-1.11:
113-
@echo "run test in go 1.11"
114-
echo "$${DOCKERFILE_GO_1_11}" > "dockerfile_go_1.11"
115-
docker build -f "./dockerfile_go_1.11" -t "${PREFIX}:go-1.11" .
116-
rm -f "./dockerfile_go_1.11"
117-
docker run --name "${PREFIX}-go-1.11-unit" -t "${PREFIX}:go-1.11"
118-
docker rm "${PREFIX}-go-1.11-unit"
119-
docker rmi "${PREFIX}:go-1.11"
112+
unit-runtime-go-1.13:
113+
@echo "run test in go 1.13"
114+
echo "$${DOCKERFILE_GO_1_13}" > "dockerfile_go_1.13"
115+
docker build -f "./dockerfile_go_1.13" -t "${PREFIX}:go-1.13" .
116+
rm -f "./dockerfile_go_1.13"
117+
docker run --name "${PREFIX}-go-1.13-unit" -t "${PREFIX}:go-1.13"
118+
docker rm "${PREFIX}-go-1.13-unit"
119+
docker rmi "${PREFIX}:go-1.13"
120120
@echo "ok"
121121

122122
export define DOCKERFILE_GO_1_10

‎go.mod

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module github.com/yunify/qingcloud-sdk-go
2+
3+
go 1.13
4+
5+
require (
6+
github.com/DATA-DOG/godog v0.10.0
7+
github.com/sirupsen/logrus v1.6.0
8+
github.com/stretchr/testify v1.6.1
9+
gopkg.in/yaml.v2 v2.3.0
10+
)
11+
12+
replace github.com/DATA-DOG/godog v0.10.0 => github.com/cucumber/godog v0.7.9
13+
14+
replace github.com/golang/lint v0.0.0-20200302205851-738671d3881b => golang.org/x/lint v0.0.0-20200302205851-738671d3881b
15+
16+
replace golang.org/x/lint v0.0.0-20200302205851-738671d3881b => github.com/golang/lint v0.0.0-20200302205851-738671d3881b

‎go.sum

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
github.com/cucumber/godog v0.7.9 h1:xBFguv4NJkVgDTGE95g53uzxruxQMclSee/L6rI7NTc=
2+
github.com/cucumber/godog v0.7.9/go.mod h1:2+kSV+QWoeX5l4THUNR1v5OnHuGM9QUD7nQILpqoklI=
3+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
5+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6+
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
7+
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
8+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
9+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
10+
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
11+
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
12+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
13+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
14+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
15+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
16+
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
17+
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
18+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
19+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
20+
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
21+
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
22+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
23+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎vendor/github.com/DATA-DOG/godog/.gitignore

-2
This file was deleted.

‎vendor/github.com/DATA-DOG/godog/.travis.yml

-18
This file was deleted.

‎vendor/github.com/DATA-DOG/godog/CHANGELOG.md

-73
This file was deleted.

‎vendor/github.com/DATA-DOG/godog/LICENSE

-28
This file was deleted.

‎vendor/github.com/DATA-DOG/godog/Makefile

-32
This file was deleted.

0 commit comments

Comments
 (0)