Use latest stable version of jsonnet-bundler (thanos-io#2766)

Signed-off-by: Kemal Akkoyun <[email protected]>
vinted · Jun 15, 2020 · 778077e · 778077e
1 parent 5259533
commit 778077e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -70,11 +70,11 @@ $(HUGO): .bingo/hugo.mod
 	@echo "(re)installing $(GOBIN)/hugo-v0.55.3"
 	@cd .bingo && $(GO) build -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.55.3 "github.com/gohugoio/hugo"
 
-JB := $(GOBIN)/jb-v0.2.1-0.20200211220001-efe0c9e86443
+JB := $(GOBIN)/jb-v0.4.0
 $(JB): .bingo/jb.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/jb-v0.2.1-0.20200211220001-efe0c9e86443"
-	@cd .bingo && $(GO) build -modfile=jb.mod -o=$(GOBIN)/jb-v0.2.1-0.20200211220001-efe0c9e86443 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
+	@echo "(re)installing $(GOBIN)/jb-v0.4.0"
+	@cd .bingo && $(GO) build -modfile=jb.mod -o=$(GOBIN)/jb-v0.4.0 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
 
 JSONNET := $(GOBIN)/jsonnet-v0.16.0
 $(JSONNET): .bingo/jsonnet.mod

diff --git a/.bingo/jb.mod b/.bingo/jb.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.14
 
-require github.com/jsonnet-bundler/jsonnet-bundler v0.2.1-0.20200211220001-efe0c9e86443 // cmd/jb
+require github.com/jsonnet-bundler/jsonnet-bundler v0.4.0 // cmd/jb
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -26,7 +26,7 @@ GOLANGCI_LINT="${gobin}/golangci-lint-v1.27.0"
 
 HUGO="${gobin}/hugo-v0.55.3"
 
-JB="${gobin}/jb-v0.2.1-0.20200211220001-efe0c9e86443"
+JB="${gobin}/jb-v0.4.0"
 
 JSONNET="${gobin}/jsonnet-v0.16.0"
 

diff --git a/mixin/jsonnetfile.json b/mixin/jsonnetfile.json
@@ -1,9 +1,10 @@
 {
+  "version": 1,
   "dependencies": [
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/grafonnet-lib",
+          "remote": "https://github.com/grafana/grafonnet-lib.git",
           "subdir": "grafonnet"
         }
       },
@@ -12,7 +13,7 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "grafana-builder"
         }
       },

diff --git a/mixin/jsonnetfile.lock.json b/mixin/jsonnetfile.lock.json
@@ -1,19 +1,20 @@
 {
+  "version": 1,
   "dependencies": [
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/grafonnet-lib",
+          "remote": "https://github.com/grafana/grafonnet-lib.git",
           "subdir": "grafonnet"
         }
       },
-      "version": "69bc267211790a1c3f4ea6e6211f3e8ffe22f987",
-      "sum": "BjHfWzqSAgtAKEVD6ipoYOkb8XT5wSBIboY4ZLwhlOU="
+      "version": "8fb95bd89990e493a8534205ee636bfcb8db67bd",
+      "sum": "tDuuSKE9f4Ew2bjBM33Rs6behLEAzkmKkShSt+jpAak="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "grafana-builder"
         }
       },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

		go 1.14

		require github.com/jsonnet-bundler/jsonnet-bundler v0.2.1-0.20200211220001-efe0c9e86443 // cmd/jb
		require github.com/jsonnet-bundler/jsonnet-bundler v0.4.0 // cmd/jb