Skip to content

Commit 1a4d358

Browse files
authored
Fix protobuf generation (#189)
* Fix protobuf generation Previously, the build was failing because of an HTTP error connecting to the buf plugin registry. This commit fixes the problem by replacing the buf Go plugin with the standard Go protobuf generator. * Bump rust
1 parent a395b45 commit 1a4d358

File tree

6 files changed

+253
-153
lines changed

6 files changed

+253
-153
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ golang 1.19.10
22
nodejs 16.7.0
33
shellcheck 0.7.1
44
yarn 1.22.17
5-
rust 1.60.0
5+
rust 1.71.0

bindings/go/scip/scip.pb.go

Lines changed: 60 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buf.gen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins:
66
out: ./docs/
77
opt: docs/scip.sprig,scip.md
88
# NOTE: the sprig file is a template, it is not generated.
9-
- remote: buf.build/library/plugins/go:v1.27.1-1
9+
- name: go
1010
out: ./bindings/go/scip/
1111
opt:
1212
- paths=source_relative

dev/proto-generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
set -euo pipefail
3+
set -xeuo pipefail
44

55
cd "$(dirname "${BASH_SOURCE[0]}")/.." # cd to repo root dir
66

go.mod

Lines changed: 56 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,79 +3,103 @@ module github.com/sourcegraph/scip
33
go 1.19
44

55
require (
6-
github.com/bufbuild/buf v1.4.0
7-
github.com/google/go-cmp v0.5.7
6+
github.com/bufbuild/buf v1.25.0
7+
github.com/google/go-cmp v0.5.9
88
github.com/google/gofuzz v1.1.0
99
github.com/hexops/gotextdiff v1.0.3
1010
github.com/hhatto/gocloc v0.4.2
1111
github.com/k0kubun/pp/v3 v3.1.0
1212
github.com/pseudomuto/protoc-gen-doc v1.5.1
1313
github.com/smacker/go-tree-sitter v0.0.0-20220209044044-0d3022e933c3
1414
github.com/sourcegraph/sourcegraph/lib v0.0.0-20220511160847-5a43d3ea24eb
15-
github.com/stretchr/testify v1.7.1
15+
github.com/stretchr/testify v1.8.4
1616
github.com/urfave/cli/v2 v2.25.7
17-
golang.org/x/tools v0.1.10
18-
google.golang.org/protobuf v1.28.0
17+
golang.org/x/tools v0.11.0
18+
google.golang.org/protobuf v1.31.0
1919
)
2020

2121
require (
22+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2223
github.com/Masterminds/semver v1.4.2 // indirect
2324
github.com/Masterminds/sprig v2.15.0+incompatible // indirect
25+
github.com/Microsoft/go-winio v0.6.1 // indirect
2426
github.com/aokoli/goutils v1.0.1 // indirect
27+
github.com/bufbuild/connect-go v1.9.0 // indirect
28+
github.com/bufbuild/connect-opentelemetry-go v0.4.0 // indirect
29+
github.com/bufbuild/protocompile v0.5.1 // indirect
2530
github.com/cockroachdb/errors v1.8.9 // indirect
2631
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
2732
github.com/cockroachdb/redact v1.1.3 // indirect
33+
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
2834
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
2935
github.com/davecgh/go-spew v1.1.1 // indirect
36+
github.com/docker/cli v24.0.4+incompatible // indirect
37+
github.com/docker/distribution v2.8.2+incompatible // indirect
38+
github.com/docker/docker v24.0.4+incompatible // indirect
39+
github.com/docker/docker-credential-helpers v0.8.0 // indirect
40+
github.com/docker/go-connections v0.4.0 // indirect
41+
github.com/docker/go-units v0.5.0 // indirect
3042
github.com/envoyproxy/protoc-gen-validate v0.3.0-java // indirect
43+
github.com/felixge/fgprof v0.9.3 // indirect
3144
github.com/getsentry/sentry-go v0.12.0 // indirect
45+
github.com/go-chi/chi/v5 v5.0.10 // indirect
3246
github.com/go-enry/go-enry/v2 v2.7.2 // indirect
3347
github.com/go-enry/go-oniguruma v1.2.1 // indirect
34-
github.com/gofrs/flock v0.8.1 // indirect
35-
github.com/gofrs/uuid v4.2.0+incompatible // indirect
48+
github.com/go-logr/logr v1.2.4 // indirect
49+
github.com/go-logr/stdr v1.2.2 // indirect
50+
github.com/gofrs/uuid/v5 v5.0.0 // indirect
3651
github.com/gogo/protobuf v1.3.2 // indirect
37-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
38-
github.com/golang/protobuf v1.5.2 // indirect
52+
github.com/golang/protobuf v1.5.3 // indirect
53+
github.com/google/go-containerregistry v0.15.2 // indirect
54+
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
3955
github.com/google/uuid v1.3.0 // indirect
4056
github.com/huandu/xstrings v1.0.0 // indirect
4157
github.com/imdario/mergo v0.3.4 // indirect
42-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
43-
github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect
44-
github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect
45-
github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753 // indirect
58+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
59+
github.com/jdxcode/netrc v0.0.0-20221124155335-4616370d1a84 // indirect
4660
github.com/json-iterator/go v1.1.12 // indirect
47-
github.com/klauspost/compress v1.15.1 // indirect
48-
github.com/klauspost/pgzip v1.2.5 // indirect
49-
github.com/kr/pretty v0.3.0 // indirect
61+
github.com/klauspost/compress v1.16.7 // indirect
62+
github.com/klauspost/pgzip v1.2.6 // indirect
63+
github.com/kr/pretty v0.3.1 // indirect
5064
github.com/kr/text v0.2.0 // indirect
5165
github.com/mattn/go-colorable v0.1.12 // indirect
5266
github.com/mattn/go-isatty v0.0.14 // indirect
67+
github.com/mitchellh/go-homedir v1.1.0 // indirect
68+
github.com/moby/term v0.5.0 // indirect
5369
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5470
github.com/modern-go/reflect2 v1.0.2 // indirect
71+
github.com/morikuni/aec v1.0.0 // indirect
5572
github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 // indirect
73+
github.com/opencontainers/go-digest v1.0.0 // indirect
74+
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
5675
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
5776
github.com/pkg/errors v0.9.1 // indirect
58-
github.com/pkg/profile v1.6.0 // indirect
77+
github.com/pkg/profile v1.7.0 // indirect
5978
github.com/pmezard/go-difflib v1.0.0 // indirect
6079
github.com/pseudomuto/protokit v0.2.0 // indirect
61-
github.com/rogpeppe/go-internal v1.8.1 // indirect
80+
github.com/rogpeppe/go-internal v1.9.0 // indirect
81+
github.com/rs/cors v1.9.0 // indirect
6282
github.com/russross/blackfriday/v2 v2.1.0 // indirect
63-
github.com/spf13/cobra v1.4.0 // indirect
83+
github.com/sirupsen/logrus v1.9.3 // indirect
84+
github.com/spf13/cobra v1.7.0 // indirect
6485
github.com/spf13/pflag v1.0.5 // indirect
86+
github.com/tetratelabs/wazero v1.3.0 // indirect
87+
github.com/vbatts/tar-split v0.11.3 // indirect
6588
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
66-
go.opencensus.io v0.23.0 // indirect
67-
go.uber.org/atomic v1.9.0 // indirect
68-
go.uber.org/multierr v1.8.0 // indirect
69-
go.uber.org/zap v1.21.0 // indirect
70-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
71-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
72-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
73-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
74-
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
75-
golang.org/x/text v0.3.7 // indirect
76-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
89+
go.opentelemetry.io/otel v1.16.0 // indirect
90+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
91+
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
93+
go.uber.org/atomic v1.11.0 // indirect
94+
go.uber.org/multierr v1.11.0 // indirect
95+
go.uber.org/zap v1.24.0 // indirect
96+
golang.org/x/crypto v0.11.0 // indirect
97+
golang.org/x/mod v0.12.0 // indirect
98+
golang.org/x/net v0.12.0 // indirect
99+
golang.org/x/sync v0.3.0 // indirect
100+
golang.org/x/sys v0.10.0 // indirect
101+
golang.org/x/term v0.10.0 // indirect
102+
golang.org/x/text v0.11.0 // indirect
77103
google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect
78-
google.golang.org/grpc v1.45.0 // indirect
79-
gopkg.in/yaml.v2 v2.4.0 // indirect
80104
gopkg.in/yaml.v3 v3.0.1 // indirect
81105
)

0 commit comments

Comments
 (0)