Skip to content

Commit 758ad2d

Browse files
committed
feat(vendor): switch dep to go module
Signed-off-by: Bo-Yi Wu <[email protected]>
1 parent 8581680 commit 758ad2d

File tree

8 files changed

+54
-163
lines changed

8 files changed

+54
-163
lines changed

.appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ environment:
1111
secure: '4YzzahbEiMZQJpOCOd1LAw=='
1212
DOCKER_PASSWORD:
1313
secure: 'VqO/G3Zfslu6zSLdwHKO+Q=='
14+
GO111MODULE: on
1415

1516
install:
1617
- ps: |
@@ -21,9 +22,6 @@ install:
2122
2223
build_script:
2324
- ps: |
24-
go get -u github.com/golang/dep/cmd/dep
25-
dep ensure
26-
2725
if ( $env:APPVEYOR_REPO_TAG -eq 'false' ) {
2826
go build -ldflags "-X main.build=$env:APPVEYOR_BUILD_VERSION" -a -o release/drone-s3.exe
2927
} else {

.drone.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,24 @@ workspace:
33
path: src/github.com/drone-plugins/drone-s3
44

55
pipeline:
6-
deps:
7-
image: golang:1.10
8-
pull: true
9-
commands:
10-
- go get -u github.com/golang/dep/cmd/dep
11-
- dep ensure
12-
136
test:
14-
image: golang:1.10
7+
image: golang:1.11
158
pull: true
9+
environment:
10+
- GO111MODULE=on
1611
commands:
1712
- go vet ./...
1813
- go test -cover ./...
1914

2015
build_linux_amd64:
21-
image: golang:1.10
16+
image: golang:1.11
2217
pull: true
2318
group: build
2419
environment:
2520
- GOOS=linux
2621
- GOARCH=amd64
2722
- CGO_ENABLED=0
23+
- GO111MODULE=on
2824
commands:
2925
- |
3026
if test "${DRONE_TAG}" = ""; then
@@ -34,13 +30,14 @@ pipeline:
3430
fi
3531
3632
build_linux_i386:
37-
image: golang:1.10
33+
image: golang:1.11
3834
pull: true
3935
group: build
4036
environment:
4137
- GOOS=linux
4238
- GOARCH=386
4339
- CGO_ENABLED=0
40+
- GO111MODULE=on
4441
commands:
4542
- |
4643
if test "${DRONE_TAG}" = ""; then
@@ -50,13 +47,14 @@ pipeline:
5047
fi
5148
5249
build_linux_arm64:
53-
image: golang:1.10
50+
image: golang:1.11
5451
pull: true
5552
group: build
5653
environment:
5754
- GOOS=linux
5855
- GOARCH=arm64
5956
- CGO_ENABLED=0
57+
- GO111MODULE=on
6058
commands:
6159
- |
6260
if test "${DRONE_TAG}" = ""; then
@@ -66,14 +64,15 @@ pipeline:
6664
fi
6765
6866
build_linux_arm:
69-
image: golang:1.10
67+
image: golang:1.11
7068
pull: true
7169
group: build
7270
environment:
7371
- GOOS=linux
7472
- GOARCH=arm
7573
- CGO_ENABLED=0
7674
- GOARM=7
75+
- GO111MODULE=on
7776
commands:
7877
- |
7978
if test "${DRONE_TAG}" = ""; then

Gopkg.lock

Lines changed: 0 additions & 123 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 23 deletions
This file was deleted.

go.mod

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module github.com/drone-plugins/drone-s3
2+
3+
require (
4+
github.com/aws/aws-sdk-go v1.16.17
5+
github.com/joho/godotenv v1.3.0
6+
github.com/mattn/go-zglob v0.0.1
7+
github.com/sirupsen/logrus v1.3.0
8+
github.com/urfave/cli v1.20.0
9+
golang.org/x/net v0.0.0-20190110200230-915654e7eabc // indirect
10+
golang.org/x/text v0.3.0 // indirect
11+
)

go.sum

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
github.com/aws/aws-sdk-go v1.16.17 h1:hHRKZhoB4qEY17aGNp71UxQFyYpx6WZXGMUzx9y/A4w=
2+
github.com/aws/aws-sdk-go v1.16.17/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
3+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
6+
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
7+
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
8+
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
9+
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
10+
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
11+
github.com/mattn/go-zglob v0.0.1 h1:xsEx/XUoVlI6yXjqBK062zYhRTZltCNmYPx6v+8DNaY=
12+
github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo=
13+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
14+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
15+
github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
16+
github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
17+
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
18+
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
19+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
20+
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
21+
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
22+
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
23+
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
24+
golang.org/x/net v0.0.0-20190110200230-915654e7eabc h1:Yx9JGxI1SBhVLFjpAkWMaO1TF+xyqtHLjZpvQboJGiM=
25+
golang.org/x/net v0.0.0-20190110200230-915654e7eabc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
26+
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
27+
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
28+
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
29+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/joho/godotenv"
8+
"github.com/sirupsen/logrus"
99
"github.com/urfave/cli"
1010
)
1111

plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"path/filepath"
77
"strings"
88

9-
log "github.com/Sirupsen/logrus"
109
"github.com/aws/aws-sdk-go/aws"
1110
"github.com/aws/aws-sdk-go/aws/credentials"
1211
"github.com/aws/aws-sdk-go/aws/session"
1312
"github.com/aws/aws-sdk-go/service/s3"
1413
"github.com/mattn/go-zglob"
14+
log "github.com/sirupsen/logrus"
1515
)
1616

1717
// Plugin defines the S3 plugin parameters.

0 commit comments

Comments
 (0)