Skip to content

Commit 1834a39

Browse files
authored
Merge pull request github#16738 from github/mbg/go/remove-go-work
Go: Remove `go.work` file
2 parents e244eef + e10e289 commit 1834a39

File tree

4 files changed

+2
-11
lines changed

4 files changed

+2
-11
lines changed

go/extractor/go.work

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

go/extractor/go.work.sum

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

go/extractor/vendor/modules.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
## workspace
21
# golang.org/x/mod v0.15.0
32
## explicit; go 1.18
43
golang.org/x/mod/internal/lazyregexp

go/gen.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Update generated files related to Go in the repo. Using --force will regenerate all files from scratch.
33
44
In particular the script will:
5-
1. update the `vendor` dir with `go work vendor` (using a go toolchain provided by bazel)
5+
1. update the `vendor` dir with `go mod vendor` (using a go toolchain provided by bazel)
66
2. update `BUILD.bazel` files using gazelle
77
3. update `ql/lib/go.dbscheme` using a compiled `go-dbschemegen`
88
"""
@@ -48,7 +48,7 @@ def options():
4848
existing_build_files = set(go_extractor_dir.glob("*/**/BUILD.bazel"))
4949

5050
print("updating vendor directory")
51-
subprocess.check_call([go, "-C", go_extractor_dir, "work", "vendor"])
51+
subprocess.check_call([go, "-C", go_extractor_dir, "mod", "vendor"])
5252

5353
if opts.force:
5454
print("clearing generated BUILD files")

0 commit comments

Comments
 (0)