Skip to content

Commit bf69c76

Browse files
authored
Merge pull request github#16987 from github/redsun82/go
Go/Bazel: use gazelle `go_deps` instead of a vendor directory
2 parents a8a4a20 + e469534 commit bf69c76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+19
-19381
lines changed

MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ use_repo(
144144
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
145145
go_sdk.download(version = "1.22.2")
146146

147+
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
148+
go_deps.from_file(go_mod = "//go/extractor:go.mod")
149+
use_repo(go_deps, "org_golang_x_mod", "org_golang_x_tools")
150+
147151
lfs_files = use_repo_rule("//misc/bazel:lfs.bzl", "lfs_files")
148152

149153
lfs_files(

go/extractor/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ go_library(
2121
"//go/extractor/toolchain",
2222
"//go/extractor/trap",
2323
"//go/extractor/util",
24-
"//go/extractor/vendor/golang.org/x/mod/modfile",
25-
"//go/extractor/vendor/golang.org/x/tools/go/packages",
24+
"@org_golang_x_mod//modfile:go_default_library",
25+
"@org_golang_x_tools//go/packages:go_default_library",
2626
],
2727
)
2828

go/extractor/dbscheme/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/extractor/go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ module github.com/github/codeql-go/extractor
22

33
go 1.22.0
44

5+
// when updating this, run
6+
// bazel run @rules_go//go -- mod tidy
7+
// when adding or removing dependencies, run
8+
// bazel mod tidy
59
require (
6-
golang.org/x/mod v0.15.0
10+
golang.org/x/mod v0.16.0
711
golang.org/x/tools v0.18.0
812
)

go/extractor/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
2-
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1+
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
2+
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
33
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
44
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
55
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=

go/extractor/project/BUILD.bazel

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

go/extractor/trap/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/extractor/util/BUILD.bazel

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

go/extractor/vendor/golang.org/x/mod/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

go/extractor/vendor/golang.org/x/mod/PATENTS

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)