diff --git a/.drone.yml b/.drone.yml index 2838f94..ce39936 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,12 +3,22 @@ workspace: path: github.com/appleboy/gin-jwt pipeline: - vendor: + vendor-install: image: golang:1.11 pull: true + group: install commands: - make install + module-install: + image: golang:1.11 + pull: true + group: install + environment: + - GO111MODULE=on + commands: + - make install-module + build: image: golang:1.11 pull: true diff --git a/Makefile b/Makefile index 706a44b..68994d7 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ install: fi govendor sync +install-module: + go mod download + embedmd-check: @hash embedmd > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) get -u github.com/campoy/embedmd; \ @@ -73,5 +76,6 @@ coverage: gocovmerge $(shell find . -type f -name "coverage.out") > coverage.all;\ clean: + go clean -modcache rm -rf .cover find . -name "coverage.txt" diff --git a/go.mod b/go.mod index 067b927..a4b760d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/davecgh/go-spew v1.1.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 - github.com/gin-gonic/gin v0.0.0-20180512030042-bf7803815b0b + github.com/gin-gonic/gin v1.3.0 github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70 github.com/json-iterator/go v0.0.0-20170804232253-1cfa233923ea github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 diff --git a/go.sum b/go.sum index 927782e..ad6672d 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY= github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= -github.com/gin-gonic/gin v0.0.0-20180512030042-bf7803815b0b h1:499x87Cnm/smy5wEx5DhVM0zq1jHRJgyC1cNdnjHc5o= -github.com/gin-gonic/gin v0.0.0-20180512030042-bf7803815b0b/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= +github.com/gin-gonic/gin v1.3.0 h1:kCmZyPklC0gVdL728E6Aj20uYBJV93nj/TkwBTKhFbs= +github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70 h1:WKo1/VPcI3cbJwnIHISxazgDxbw+UIrktU3zNxzcp4c= github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/json-iterator/go v0.0.0-20170804232253-1cfa233923ea/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= diff --git a/vendor/vendor.json b/vendor/vendor.json index 30bad55..941512f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -31,10 +31,12 @@ "revisionTime": "2017-01-09T09:34:21Z" }, { - "checksumSHA1": "MpR9RgPROnhWJpt8Npahzc+8798=", + "checksumSHA1": "90S9sFqcIo/uuwQzz1t/wYs7GEs=", "path": "github.com/gin-gonic/gin", - "revision": "bf7803815b0baa22ff7a10457932882dfbf09925", - "revisionTime": "2018-05-12T03:00:42Z" + "revision": "b869fe1415e4b9eb52f247441830d502aece2d4d", + "revisionTime": "2018-08-14T08:58:52Z", + "version": "v1.3.0", + "versionExact": "v1.3.0" }, { "checksumSHA1": "O2rrqYI7QQjJYVx8+E8DC8rlIh0=", @@ -43,16 +45,24 @@ "revisionTime": "2018-05-12T03:00:42Z" }, { - "checksumSHA1": "YOwO5bkv3ei+GTVZqeEVB30kXDM=", + "checksumSHA1": "Y8Vu2NT4c2ve963fedBxoJyiU6s=", + "path": "github.com/gin-gonic/gin/internal/json", + "revision": "01ca2530d4b6c44c718b00c06f0e1d092572d49e", + "revisionTime": "2018-10-14T04:39:16Z" + }, + { + "checksumSHA1": "woO1qIxIeQ1bcbPSiMfAKk3r4xg=", "path": "github.com/gin-gonic/gin/json", - "revision": "81007d2ce0176f7a9ce52dd12e56edd7ef40e72c", - "revisionTime": "2017-08-04T05:45:59Z" + "revision": "b869fe1415e4b9eb52f247441830d502aece2d4d", + "revisionTime": "2018-08-14T08:58:52Z", + "version": "v1.3.0", + "versionExact": "v1.3.0" }, { - "checksumSHA1": "DGs8sdsCkNHsU9+fQMM9XHb+ZCE=", + "checksumSHA1": "afLqBfX9SeIP6eeTZb3WwdTFaOo=", "path": "github.com/gin-gonic/gin/render", - "revision": "bf7803815b0baa22ff7a10457932882dfbf09925", - "revisionTime": "2018-05-12T03:00:42Z" + "revision": "01ca2530d4b6c44c718b00c06f0e1d092572d49e", + "revisionTime": "2018-10-14T04:39:16Z" }, { "checksumSHA1": "kBeNcaKk56FguvPSUCEaH6AxpRc=",