From 01004f939e78a3cc4cf5e6a2d340360291c080d5 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 11 Jan 2019 10:48:42 +0800 Subject: [PATCH] feat(vendor): switch dep to go module Signed-off-by: Bo-Yi Wu --- .appveyor.yml | 4 +--- .drone.yml | 23 +++++++++++------------ Gopkg.lock | 27 --------------------------- Gopkg.toml | 11 ----------- go.mod | 8 ++++++++ go.sum | 8 ++++++++ 6 files changed, 28 insertions(+), 53 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 4b6f017..bed6aa1 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-dockerhub.exe } else { diff --git a/.drone.yml b/.drone.yml index 9a81149..ed221f2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,28 +3,24 @@ workspace: path: src/github.com/drone-plugins/drone-dockerhub pipeline: - deps: - image: golang:1.10 - pull: true - commands: - - go get -u github.com/golang/dep/cmd/dep - - dep ensure - test: - image: golang:1.10 + 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 @@ -34,13 +30,14 @@ pipeline: fi build_linux_i386: - image: golang:1.10 + image: golang:1.11 pull: true group: build environment: - GOOS=linux - GOARCH=386 - CGO_ENABLED=0 + - GO111MODULE=on commands: - | if test "${DRONE_TAG}" = ""; then @@ -50,13 +47,14 @@ pipeline: fi build_linux_arm64: - image: golang:1.10 + image: golang:1.11 pull: true group: build environment: - GOOS=linux - GOARCH=arm64 - CGO_ENABLED=0 + - GO111MODULE=on commands: - | if test "${DRONE_TAG}" = ""; then @@ -66,7 +64,7 @@ pipeline: fi build_linux_arm: - image: golang:1.10 + image: golang:1.11 pull: true group: build environment: @@ -74,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 3e4c05b..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,27 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:da5c468e0a7858053be82e2df5f40626c0f6b9ed60fafb1ac15d71c2c3101ad0" - name = "github.com/drone/drone-go" - packages = ["plugin"] - pruneopts = "UT" - revision = "eaa41f7836a191224ec5702d2458db07882ec269" - -[[projects]] - digest = "1:cc9f0c72e45707522afc156b3d715443e2021acedff165a4803f72a0d2ed170f" - name = "gopkg.in/matryer/try.v1" - packages = ["."] - pruneopts = "UT" - revision = "312d2599e12e89ca89b52a09597394f449235d80" - version = "v1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/drone/drone-go/plugin", - "gopkg.in/matryer/try.v1", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 026e0c2..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,11 +0,0 @@ -[[constraint]] - name = "github.com/drone/drone-go" - revision = "eaa41f7836a191224ec5702d2458db07882ec269" - -[[constraint]] - name = "gopkg.in/matryer/try.v1" - version = "1.0.0" - -[prune] - go-tests = true - unused-packages = true diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..2e748a6 --- /dev/null +++ b/go.mod @@ -0,0 +1,8 @@ +module github.com/drone-plugins/drone-dockerhub + +require ( + github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect + github.com/drone/drone-go v0.0.0-20160502151758-eaa41f7836a1 + github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 // indirect + gopkg.in/matryer/try.v1 v1.0.0-20150601225556-312d2599e12e +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..2f34294 --- /dev/null +++ b/go.sum @@ -0,0 +1,8 @@ +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= +github.com/drone/drone-go v0.0.0-20160502151758-eaa41f7836a1 h1:2fZ6NZF8Z37FLn5NIElsW3OELMY2xzQ2XPuXJmnAowE= +github.com/drone/drone-go v0.0.0-20160502151758-eaa41f7836a1/go.mod h1:qVb1k1w9X5jgoGyLtbnfWNnd4XZfAwokxBmiutbpGqw= +github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 h1:JAEbJn3j/FrhdWA9jW8B5ajsLIjeuEHLi8xE4fk997o= +github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= +gopkg.in/matryer/try.v1 v1.0.0-20150601225556-312d2599e12e h1:bJHzu9Qwc9wQRWJ/WVkJGAfs+riucl/tKAFNxf9pzqk= +gopkg.in/matryer/try.v1 v1.0.0-20150601225556-312d2599e12e/go.mod h1:tve0rTLdGlwnXF7iBO9rbAEyeXvuuPx0n4DvXS/Nw7o=