From f4d34b54e5b16cee884a3c55f4abcbe2aa3396dc Mon Sep 17 00:00:00 2001 From: Leo Balduf Date: Sat, 12 Oct 2019 11:59:19 +0900 Subject: [PATCH 1/3] travis: update to go 1.13 --- .travis.yml | 3 +-- go.mod | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9207fc2..a6b92a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go go: - - 1.11.x + - 1.13.x sudo: false matrix: include: @@ -9,7 +9,6 @@ matrix: - go get -u golang.org/x/lint/golint - go get -u golang.org/x/tools/cmd/... script: - - export GO111MODULE=on - go mod download - go test -v -race $(go list ./...) - go vet $(go list ./...) diff --git a/go.mod b/go.mod index 7e8715a..ff7de27 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/chihaya/chihaya +go 1.13 + require ( github.com/SermoDigital/jose v0.0.0-20180104203859-803625baeddc github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect From 0936bd3f9a11d4bbc8f9442b8c57163a1c85a95e Mon Sep 17 00:00:00 2001 From: Leo Balduf Date: Sat, 12 Oct 2019 12:09:08 +0900 Subject: [PATCH 2/3] cmd/chihaya: fix imports for updated goimports --- cmd/chihaya/config.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/chihaya/config.go b/cmd/chihaya/config.go index 2f58848..453bd6b 100644 --- a/cmd/chihaya/config.go +++ b/cmd/chihaya/config.go @@ -10,17 +10,13 @@ import ( "github.com/chihaya/chihaya/frontend/http" "github.com/chihaya/chihaya/frontend/udp" "github.com/chihaya/chihaya/middleware" -) -import ( // Imports to register middleware drivers. _ "github.com/chihaya/chihaya/middleware/clientapproval" _ "github.com/chihaya/chihaya/middleware/jwt" _ "github.com/chihaya/chihaya/middleware/torrentapproval" _ "github.com/chihaya/chihaya/middleware/varinterval" -) -import ( // Imports to register storage drivers. _ "github.com/chihaya/chihaya/storage/memory" _ "github.com/chihaya/chihaya/storage/redis" From 797d0cb6e2e26dba721269cf70b13e538b965bfb Mon Sep 17 00:00:00 2001 From: Leo Balduf Date: Sat, 12 Oct 2019 12:14:39 +0900 Subject: [PATCH 3/3] travis: try to go get the latest dependencies --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a6b92a3..641f666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: - kill $pid # Using HEAD of dependencies - install: - - go get -t ./... + - go get -t -u ./... - go get -u golang.org/x/lint/golint - go get -u golang.org/x/tools/cmd/... script: @@ -39,7 +39,7 @@ matrix: allow_failures: # Using HEAD of dependencies - install: - - go get -t ./... + - go get -t -u ./... - go get -u golang.org/x/lint/golint - go get -u golang.org/x/tools/cmd/... script: