Merge pull request #11 from devsbb/go-mod-new-caddy

Use go mod and new caddy import
lucaslorentz · Nov 26, 2019 · 225d711 · 225d711
2 parents 437634b + 3a25214
commit 225d711
Show file tree

Hide file tree

Showing 11 changed files with 428 additions and 229 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,12 @@ sudo: required
 go_import_path: github.com/lucaslorentz/caddy-supervisor
 
 go:
- - 1.9.x
+ - 1.13.x
 
 dist: trusty
 
 install:
-  - go get -v github.com/Masterminds/glide
-  - cd $GOPATH/src/github.com/Masterminds/glide && git checkout tags/v0.12.3 && go install && cd -
-  - glide install
-
+ - export GO111MODULE=on
+ - go get -v
 script:
   - ./build.sh
diff --git a/build.sh b/build.sh
@@ -2,10 +2,8 @@
 
 set -e
 
-glide install
-
-go vet $(glide novendor)
-go test -race -v $(glide novendor)
+go get -v
+go test -race -v
 
 CGO_ENABLED=0 go build -o caddy
 

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
diff --git a/go.mod b/go.mod
@@ -0,0 +1,13 @@
+module github.com/lucaslorentz/caddy-supervisor
+
+go 1.13
+
+require (
+	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Masterminds/sprig v2.15.0+incompatible
+	github.com/aokoli/goutils v1.1.0 // indirect
+	github.com/caddyserver/caddy v1.0.4
+	github.com/hacdias/caddy-service v1.0.1
+	github.com/huandu/xstrings v1.2.1 // indirect
+	github.com/imdario/mergo v0.3.8 // indirect
+)