Skip to content

Commit cdc6d9c

Browse files
committed
Upgrade jsonnet-bundler (#108)
Signed-off-by: Kemal Akkoyun <[email protected]>
1 parent 52c51cc commit cdc6d9c

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ $(JSONNET_FMT): $(BIN_DIR)
7272
go build -o $@ github.com/google/go-jsonnet/cmd/jsonnetfmt
7373

7474
$(JSONNET_BUNDLER): $(BIN_DIR)
75-
curl -L -o $(JSONNET_BUNDLER) "https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.2.0/jb-$(shell go env GOOS)-$(shell go env GOARCH)"
75+
curl -L -o $(JSONNET_BUNDLER) "https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.3.1/jb-$(shell go env GOOS)-$(shell go env GOARCH)"
7676
chmod +x $(JSONNET_BUNDLER)

jsonnetfile.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
{
2+
"version": 1,
23
"dependencies": [
34
{
4-
"name": "grafana-builder",
55
"source": {
66
"git": {
7-
"remote": "https://github.com/grafana/jsonnet-libs",
8-
"subdir": "grafana-builder"
7+
"remote": "https://github.com/grafana/grafonnet-lib",
8+
"subdir": "grafonnet"
99
}
1010
},
1111
"version": "master"
1212
},
1313
{
14-
"name": "grafonnet",
1514
"source": {
1615
"git": {
17-
"remote": "https://github.com/grafana/grafonnet-lib",
18-
"subdir": "grafonnet"
16+
"remote": "https://github.com/grafana/jsonnet-libs",
17+
"subdir": "grafana-builder"
1918
}
2019
},
2120
"version": "master"
2221
},
2322
{
24-
"name": "kube-thanos",
2523
"source": {
2624
"local": {
2725
"directory": "jsonnet/kube-thanos"
2826
}
2927
},
3028
"version": "."
3129
}
32-
]
30+
],
31+
"legacyImports": true
3332
}

jsonnetfile.lock.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,45 @@
11
{
2+
"version": 1,
23
"dependencies": [
34
{
4-
"name": "grafana-builder",
55
"source": {
66
"git": {
7-
"remote": "https://github.com/grafana/jsonnet-libs",
8-
"subdir": "grafana-builder"
7+
"remote": "https://github.com/grafana/grafonnet-lib",
8+
"subdir": "grafonnet"
99
}
1010
},
11-
"version": "e92000a708ded5bde1dd332a8e7457d0b39b7928",
12-
"sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
11+
"version": "c459106d2d2b583dd3a83f6c75eb52abee3af764",
12+
"sum": "CeM3LRgUCUJTolTdMnerfMPGYmhClx7gX5ajrQVEY2Y="
1313
},
1414
{
15-
"name": "grafonnet",
1615
"source": {
1716
"git": {
18-
"remote": "https://github.com/grafana/grafonnet-lib",
19-
"subdir": "grafonnet"
17+
"remote": "https://github.com/grafana/jsonnet-libs",
18+
"subdir": "grafana-builder"
2019
}
2120
},
22-
"version": "c459106d2d2b583dd3a83f6c75eb52abee3af764",
23-
"sum": "CeM3LRgUCUJTolTdMnerfMPGYmhClx7gX5ajrQVEY2Y="
21+
"version": "e92000a708ded5bde1dd332a8e7457d0b39b7928",
22+
"sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
2423
},
2524
{
26-
"name": "ksonnet",
2725
"source": {
2826
"git": {
2927
"remote": "https://github.com/ksonnet/ksonnet-lib",
3028
"subdir": ""
3129
}
3230
},
3331
"version": "0d2f82676817bbf9e4acf6495b2090205f323b9f",
34-
"sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg="
32+
"sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg=",
33+
"name": "ksonnet"
3534
},
3635
{
37-
"name": "kube-thanos",
3836
"source": {
3937
"local": {
4038
"directory": "jsonnet/kube-thanos"
4139
}
4240
},
4341
"version": ""
4442
}
45-
]
43+
],
44+
"legacyImports": false
4645
}

0 commit comments

Comments
 (0)