Browse Source

Migrate to go mod

Vova Tkach 6 years ago
parent
commit
f42a7e1ac2
6 changed files with 44 additions and 97 deletions
  1. 0 63
      Gopkg.lock
  2. 0 30
      Gopkg.toml
  3. 7 4
      Makefile
  4. 10 0
      go.mod
  5. 15 0
      go.sum
  6. 12 0
      vendor/modules.txt

+ 0 - 63
Gopkg.lock

@@ -1,63 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  digest = "1:ec6f9bf5e274c833c911923c9193867f3f18788c461f76f05f62bb1510e0ae65"
-  name = "github.com/go-sql-driver/mysql"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "72cd26f257d44c1114970e19afddcd812016007e"
-  version = "v1.4.1"
-
-[[projects]]
-  digest = "1:43fda75367d9fc8a715e2f1484dd9290c5a111c33eaf883c0f19edc035ba41ec"
-  name = "github.com/vladimirok5959/golang-server-bootstrap"
-  packages = ["bootstrap"]
-  pruneopts = "UT"
-  revision = "560c0e2d2ce09276299ab1d50ad80b2fe5f50382"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:3d823a99a747dbcdfb547754418ca792a57dfef66c2d1f540bffbf12c07bd7bf"
-  name = "github.com/vladimirok5959/golang-server-resources"
-  packages = ["resource"]
-  pruneopts = "UT"
-  revision = "4fce983c6e02d13313582a3c9f089c06c7979e8f"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:3e4c59e0a867aea93adbfe66eb86b41a718dc9066534a068d00325164731bdf6"
-  name = "github.com/vladimirok5959/golang-server-sessions"
-  packages = ["session"]
-  pruneopts = "UT"
-  revision = "e000912f70a8354cc4d0bd05617629970e05c9b9"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:6f6c69e51e5661d173aef0a46bbe99761ff947cc84d2a33a6be71bb483db73a1"
-  name = "github.com/vladimirok5959/golang-server-static"
-  packages = ["static"]
-  pruneopts = "UT"
-  revision = "00804ab7b07769acb79f9e13b1f91c91ec812393"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:c25289f43ac4a68d88b02245742347c94f1e108c534dda442188015ff80669b3"
-  name = "google.golang.org/appengine"
-  packages = ["cloudsql"]
-  pruneopts = "UT"
-  revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1"
-  version = "v1.4.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/go-sql-driver/mysql",
-    "github.com/vladimirok5959/golang-server-bootstrap/bootstrap",
-    "github.com/vladimirok5959/golang-server-resources/resource",
-    "github.com/vladimirok5959/golang-server-sessions/session",
-    "github.com/vladimirok5959/golang-server-static/static",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1

+ 0 - 30
Gopkg.toml

@@ -1,30 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
-[prune]
-  go-tests = true
-  unused-packages = true

+ 7 - 4
Makefile

@@ -4,15 +4,15 @@ default: debug
 
 debug:
 	go vet ./...
-	go build -o ./fave
+	go build -mod vendor -o ./fave
 
 build: clean
 	@-mkdir ./bin
 	@cd ./bin
 	@cd ..
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o ./bin/fave.linux-amd64 -ldflags='-X main.Version=$(VERSION) -extldflags "-static"'
-	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -a -o ./bin/fave.darwin-amd64 -ldflags='-X main.Version=$(VERSION) -extldflags "-static"'
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -a -o ./bin/fave.windows-amd64.exe -ldflags='-X main.Version=$(VERSION) -extldflags "-static"'
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod vendor -a -o ./bin/fave.linux-amd64 -ldflags='-X main.Version=$(VERSION) -extldflags "-static"'
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -mod vendor -a -o ./bin/fave.darwin-amd64 -ldflags='-X main.Version=$(VERSION) -extldflags "-static"'
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -mod vendor -a -o ./bin/fave.windows-amd64.exe -ldflags='-X main.Version=$(VERSION) -extldflags "-static"'
 	cd ./bin && find . -name 'fave*' | xargs -I{} tar czf {}.tar.gz {}
 	cd ./bin && shasum -a 256 * > sha256sum.txt
 	cat ./bin/sha256sum.txt
@@ -25,3 +25,6 @@ test:
 
 run:
 	@./fave -host 0.0.0.0 -port 8080 -dir ./hosts
+
+update:
+	go mod vendor

+ 10 - 0
go.mod

@@ -0,0 +1,10 @@
+module golang-fave
+
+require (
+	github.com/go-sql-driver/mysql v1.4.1
+	github.com/vladimirok5959/golang-server-bootstrap v1.0.1
+	github.com/vladimirok5959/golang-server-resources v1.0.0
+	github.com/vladimirok5959/golang-server-sessions v1.0.1
+	github.com/vladimirok5959/golang-server-static v1.0.0
+	google.golang.org/appengine v1.4.0 // indirect
+)

+ 15 - 0
go.sum

@@ -0,0 +1,15 @@
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/vladimirok5959/golang-server-bootstrap v1.0.1 h1:vdLfBYdgQORd83K4imnHJbz7UaGccEgJN0t8TqLb/e4=
+github.com/vladimirok5959/golang-server-bootstrap v1.0.1/go.mod h1:R5PGBuqlupYd0evIXoi81plWH/HpNQO2V/jHxZzg2y0=
+github.com/vladimirok5959/golang-server-resources v1.0.0 h1:zX2929ItoGHDmQD6OTpxoFbO7Cj7/9Q2eAgoSAA8gNI=
+github.com/vladimirok5959/golang-server-resources v1.0.0/go.mod h1:tsf2oAEf3E3ukiQSCO7dstl0IXbEXec68UUIiMWysBc=
+github.com/vladimirok5959/golang-server-sessions v1.0.1 h1:cQsLk8hz7pkIV7/XectfejDF2j+61FE+/s4xErxBNJw=
+github.com/vladimirok5959/golang-server-sessions v1.0.1/go.mod h1:W6eCEIltyTs5IUvN1DfzLk59z+M1031kr8bMFUiq8vU=
+github.com/vladimirok5959/golang-server-static v1.0.0 h1:jmVNUCVF44+Am0euUMYFN4L3gdJYwm7aS8LFUmUAHJk=
+github.com/vladimirok5959/golang-server-static v1.0.0/go.mod h1:dxZsjCCpT65Z9dLP6p7RmR2rbgtYj6E4FSSSUqkNrsw=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

+ 12 - 0
vendor/modules.txt

@@ -0,0 +1,12 @@
+# github.com/go-sql-driver/mysql v1.4.1
+github.com/go-sql-driver/mysql
+# github.com/vladimirok5959/golang-server-bootstrap v1.0.1
+github.com/vladimirok5959/golang-server-bootstrap/bootstrap
+# github.com/vladimirok5959/golang-server-resources v1.0.0
+github.com/vladimirok5959/golang-server-resources/resource
+# github.com/vladimirok5959/golang-server-sessions v1.0.1
+github.com/vladimirok5959/golang-server-sessions/session
+# github.com/vladimirok5959/golang-server-static v1.0.0
+github.com/vladimirok5959/golang-server-static/static
+# google.golang.org/appengine v1.4.0
+google.golang.org/appengine/cloudsql