From 9db5d7d3b336d5fd3b2b3356c2cf247210f11c8b Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 11 Jan 2019 11:49:20 +0800 Subject: [PATCH] feat(vendor): switch dep to go module (#11) Signed-off-by: Bo-Yi Wu --- .appveyor.yml | 4 +--- .drone.yml | 16 ++++++-------- Gopkg.lock | 59 --------------------------------------------------- Gopkg.toml | 19 ----------------- go.mod | 13 ++++++++++++ go.sum | 25 ++++++++++++++++++++++ 6 files changed, 46 insertions(+), 90 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod create mode 100644 go.sum diff --git a/.appveyor.yml b/.appveyor.yml index 535330b..097b500 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,6 +11,7 @@ environment: secure: '4YzzahbEiMZQJpOCOd1LAw==' DOCKER_PASSWORD: secure: 'VqO/G3Zfslu6zSLdwHKO+Q==' + GO111MODULE: on install: - ps: | @@ -21,9 +22,6 @@ install: build_script: - ps: | - go get -u github.com/golang/dep/cmd/dep - dep ensure - if ( $env:APPVEYOR_REPO_TAG -eq 'false' ) { go build -ldflags "-X main.build=$env:APPVEYOR_BUILD_VERSION" -a -o release/drone-manifest.exe } else { diff --git a/.drone.yml b/.drone.yml index 7f6a1e7..b429cd0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,29 +3,24 @@ workspace: path: src/github.com/drone-plugins/drone-manifest pipeline: - deps: - image: golang:1.11 - pull: true - commands: - - go get -u github.com/golang/dep/cmd/dep - - dep ensure - - dep status - test: image: golang:1.11 pull: true + environment: + - GO111MODULE=on commands: - go vet ./... - go test -cover ./... build_linux_amd64: - image: golang:1.10 + image: golang:1.11 pull: true group: build environment: - GOOS=linux - GOARCH=amd64 - CGO_ENABLED=0 + - GO111MODULE=on commands: - | if test "${DRONE_TAG}" = ""; then @@ -42,6 +37,7 @@ pipeline: - GOOS=linux - GOARCH=386 - CGO_ENABLED=0 + - GO111MODULE=on commands: - | if test "${DRONE_TAG}" = ""; then @@ -58,6 +54,7 @@ pipeline: - GOOS=linux - GOARCH=arm64 - CGO_ENABLED=0 + - GO111MODULE=on commands: - | if test "${DRONE_TAG}" = ""; then @@ -75,6 +72,7 @@ pipeline: - GOARCH=arm - CGO_ENABLED=0 - GOARM=7 + - GO111MODULE=on commands: - | if test "${DRONE_TAG}" = ""; then diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 053c7a3..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,59 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:4333e9d9cc731d01e67e19c33da46e95860b95f8b8032bc586d69b169e1b0c1b" - name = "github.com/aymerick/raymond" - packages = [ - ".", - "ast", - "lexer", - "parser", - ] - pruneopts = "UT" - revision = "2eebd0f5dd9564c0c6e439df11d8a3c7b9b9ab11" - version = "v2.0.2" - -[[projects]] - digest = "1:0ef770954bca104ee99b3b6b7f9b240605ac03517d9f98cbc1893daa03f3c038" - name = "github.com/coreos/go-semver" - packages = ["semver"] - pruneopts = "UT" - revision = "8ab6407b697782a06568d4b7f1db25550ec2e4c6" - version = "v0.2.0" - -[[projects]] - branch = "master" - digest = "1:424d6a3ee46171455054a1d821c658c22802a798ba8e687fdc2edaca9eb30c8a" - name = "github.com/drone/drone-template-lib" - packages = ["template"] - pruneopts = "UT" - revision = "5748d3149f4859c6d6cf43edb4fa35bba379c918" - -[[projects]] - digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "UT" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - branch = "master" - digest = "1:3fb803863fd713550106aa42c4545b428401c6aad1002de19b1e634339e9cef6" - name = "github.com/urfave/cli" - packages = ["."] - pruneopts = "UT" - revision = "934abfb2f102315b5794e15ebc7949e4ca253920" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/coreos/go-semver/semver", - "github.com/drone/drone-template-lib/template", - "github.com/pkg/errors", - "github.com/urfave/cli", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 7b6fadc..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,19 +0,0 @@ -[[constraint]] - name = "github.com/coreos/go-semver" - version = "0.2.0" - -[[constraint]] - branch = "master" - name = "github.com/drone/drone-template-lib" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.0" - -[[constraint]] - branch = "master" - name = "github.com/urfave/cli" - -[prune] - go-tests = true - unused-packages = true diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..addffb6 --- /dev/null +++ b/go.mod @@ -0,0 +1,13 @@ +module github.com/drone-plugins/drone-manifest + +require ( + bou.ke/monkey v1.0.1 // indirect + github.com/aymerick/raymond v2.0.2+incompatible // indirect + github.com/coreos/go-semver v0.2.0 + github.com/drone/drone-template-lib v0.0.0-20180401170447-5748d3149f48 + github.com/pkg/errors v0.8.0 + github.com/stretchr/testify v1.3.0 // indirect + github.com/tkuchiki/faketime v0.1.1 // indirect + github.com/urfave/cli v0.0.0-20180821064027-934abfb2f102 + gopkg.in/yaml.v2 v2.2.2 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..579914e --- /dev/null +++ b/go.sum @@ -0,0 +1,25 @@ +bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U= +bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg= +github.com/aymerick/raymond v2.0.2+incompatible h1:VEp3GpgdAnv9B2GFyTvqgcKvY+mfKMjPOA3SbKLtnU0= +github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/drone/drone-template-lib v0.0.0-20180401170447-5748d3149f48 h1:hP2l5isqaiJVvOUM8X/1WDNeeJKlVmM8I1B9aDNT/xw= +github.com/drone/drone-template-lib v0.0.0-20180401170447-5748d3149f48/go.mod h1:u34woe41m58Whrf21iH6z/xLOIRM3650LhWAyUc7Oik= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/tkuchiki/faketime v0.1.1 h1:UZjBlktFAi23wo+jWuHuNoHUpLnB0j/5B62bl5nCPls= +github.com/tkuchiki/faketime v0.1.1/go.mod h1:RXY/TXAwGGL36IKDjrHFMcjpUrEiyWSEtLhFPw3UWF0= +github.com/urfave/cli v0.0.0-20180821064027-934abfb2f102 h1:Er7kUEUX12vAWCp23Uv6Nrza7kEzEm/Z77amjMT7/Lo= +github.com/urfave/cli v0.0.0-20180821064027-934abfb2f102/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=