Fix packages not vendoring on build

tidwall · Feb 11, 2020 · c567512 · c567512
1 parent 6ffdf7b
commit c567512
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 68 deletions.
diff --git a/go.sum b/go.sum
@@ -61,6 +61,7 @@ github.com/tidwall/geoindex v1.1.0 h1:d/pGCgKUonfQINd1235kKqx9gWBU4N7GjDS9WvbPvL
 github.com/tidwall/geoindex v1.1.0/go.mod h1:3gTa91BW+eiVIipuR6aU1Y9Sa0q75b1teE/NP2vfsTc=
 github.com/tidwall/geojson v1.1.8 h1:n/WT/PG0OEHrxUJQoeqkupWDt3pwbHMynl6OF9xKIM0=
 github.com/tidwall/geojson v1.1.8/go.mod h1:tBjfxeALRFLc25LLpjtWzy2nIrNmW1ze1EAhLtd8+QQ=
+github.com/tidwall/geojson v1.1.10 h1:ALzsrTn62pq65DudSQpYDjjCUaq6dP1XQm51GVYgJyo=
 github.com/tidwall/geojson v1.1.10/go.mod h1:tBjfxeALRFLc25LLpjtWzy2nIrNmW1ze1EAhLtd8+QQ=
 github.com/tidwall/gjson v1.3.2 h1:+7p3qQFaH3fOMXAJSrdZwGKcOO/lYdGS0HqGhPqDdTI=
 github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -34,6 +34,7 @@ export CGO_ENABLED=0
 if [ "$NOMODULES" != "1" ]; then
 	export GO111MODULE=on
 	export GOFLAGS=-mod=vendor
+	go mod vendor
 fi
 
 # Build and store objects into original directory.

diff --git a/vendor/github.com/tidwall/geojson/circle.go b/vendor/github.com/tidwall/geojson/circle.go
diff --git a/vendor/github.com/tidwall/geojson/feature.go b/vendor/github.com/tidwall/geojson/feature.go
diff --git a/vendor/github.com/tidwall/geojson/point.go b/vendor/github.com/tidwall/geojson/point.go
diff --git a/vendor/github.com/tidwall/geojson/simplepoint.go b/vendor/github.com/tidwall/geojson/simplepoint.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -81,7 +81,7 @@ github.com/tidwall/buntdb
 # github.com/tidwall/geoindex v1.1.0
 github.com/tidwall/geoindex
 github.com/tidwall/geoindex/child
-# github.com/tidwall/geojson v1.1.8
+# github.com/tidwall/geojson v1.1.10
 github.com/tidwall/geojson
 github.com/tidwall/geojson/geo
 github.com/tidwall/geojson/geometry