Merge pull request #14439 from github/mbg/go/workspace-experiments

Go: Move `go.mod` into `extractor` subdirectory
github · Oct 11, 2023 · 7a98afe · 7a98afe
2 parents a4eb3fd + 7d7d90e
commit 7a98afe
Show file tree

Hide file tree

Showing 88 changed files with 14 additions and 12 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -19,11 +19,8 @@ updates:
         update-types: ['version-update:semver-patch', 'version-update:semver-minor']
 
   - package-ecosystem: "gomod"
-    directory: "go"
+    directory: "go/extractor"
     schedule:
       interval: "daily"
-    allow:
-      - dependency-name: "golang.org/x/mod"
-      - dependency-name: "golang.org/x/tools"
     reviewers:
       - "github/codeql-go"
diff --git a/go/Makefile b/go/Makefile
@@ -51,7 +51,7 @@ tools: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))) tools/tokenizer.j
 
 .PHONY: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES)))
 $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))):
-	go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
+	go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
 
 tools-codeql: tools-$(CODEQL_PLATFORM)
 
@@ -61,19 +61,19 @@ tools-linux64: $(addprefix tools/linux64/,$(BINARIES))
 
 .PHONY: $(addprefix tools/linux64/,$(BINARIES))
 $(addprefix tools/linux64/,$(BINARIES)):
-	GOOS=linux GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
+	GOOS=linux GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
 
 tools-osx64: $(addprefix tools/osx64/,$(BINARIES))
 
 .PHONY: $(addprefix tools/osx64/,$(BINARIES))
 $(addprefix tools/osx64/,$(BINARIES)):
-	GOOS=darwin GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
+	GOOS=darwin GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
 
 tools-win64: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
 
 .PHONY: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
 $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES))):
-	env GOOS=windows GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
+	env GOOS=windows GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
 
 .PHONY: extractor-common extractor extractor-full
 extractor-common: codeql-extractor.yml LICENSE ql/lib/go.dbscheme \

diff --git a/go/go.mod → go/extractor/go.mod b/go/go.mod → go/extractor/go.mod
@@ -1,4 +1,4 @@
-module github.com/github/codeql-go
+module github.com/github/codeql-go/extractor
 
 go 1.21
 

diff --git a/go/go.sum → go/extractor/go.sum b/go/go.sum → go/extractor/go.sum
diff --git a/go/vendor/golang.org/x/mod/LICENSE → go/extractor/vendor/golang.org/x/mod/LICENSE b/go/vendor/golang.org/x/mod/LICENSE → go/extractor/vendor/golang.org/x/mod/LICENSE
diff --git a/go/vendor/golang.org/x/mod/PATENTS → go/extractor/vendor/golang.org/x/mod/PATENTS b/go/vendor/golang.org/x/mod/PATENTS → go/extractor/vendor/golang.org/x/mod/PATENTS
diff --git a/...g.org/x/mod/internal/lazyregexp/lazyre.go → ...g.org/x/mod/internal/lazyregexp/lazyre.go b/...g.org/x/mod/internal/lazyregexp/lazyre.go → ...g.org/x/mod/internal/lazyregexp/lazyre.go
diff --git a/go/vendor/golang.org/x/mod/modfile/print.go → .../vendor/golang.org/x/mod/modfile/print.go b/go/vendor/golang.org/x/mod/modfile/print.go → .../vendor/golang.org/x/mod/modfile/print.go
diff --git a/go/vendor/golang.org/x/mod/modfile/read.go → ...r/vendor/golang.org/x/mod/modfile/read.go b/go/vendor/golang.org/x/mod/modfile/read.go → ...r/vendor/golang.org/x/mod/modfile/read.go
diff --git a/go/vendor/golang.org/x/mod/modfile/rule.go → ...r/vendor/golang.org/x/mod/modfile/rule.go b/go/vendor/golang.org/x/mod/modfile/rule.go → ...r/vendor/golang.org/x/mod/modfile/rule.go
diff --git a/go/vendor/golang.org/x/mod/modfile/work.go → ...r/vendor/golang.org/x/mod/modfile/work.go b/go/vendor/golang.org/x/mod/modfile/work.go → ...r/vendor/golang.org/x/mod/modfile/work.go
diff --git a/go/vendor/golang.org/x/mod/module/module.go → .../vendor/golang.org/x/mod/module/module.go b/go/vendor/golang.org/x/mod/module/module.go → .../vendor/golang.org/x/mod/module/module.go
diff --git a/go/vendor/golang.org/x/mod/module/pseudo.go → .../vendor/golang.org/x/mod/module/pseudo.go b/go/vendor/golang.org/x/mod/module/pseudo.go → .../vendor/golang.org/x/mod/module/pseudo.go
diff --git a/go/vendor/golang.org/x/mod/semver/semver.go → .../vendor/golang.org/x/mod/semver/semver.go b/go/vendor/golang.org/x/mod/semver/semver.go → .../vendor/golang.org/x/mod/semver/semver.go
diff --git a/go/vendor/golang.org/x/sys/LICENSE → go/extractor/vendor/golang.org/x/sys/LICENSE b/go/vendor/golang.org/x/sys/LICENSE → go/extractor/vendor/golang.org/x/sys/LICENSE
diff --git a/go/vendor/golang.org/x/sys/PATENTS → go/extractor/vendor/golang.org/x/sys/PATENTS b/go/vendor/golang.org/x/sys/PATENTS → go/extractor/vendor/golang.org/x/sys/PATENTS
diff --git a/...endor/golang.org/x/sys/execabs/execabs.go → ...endor/golang.org/x/sys/execabs/execabs.go b/...endor/golang.org/x/sys/execabs/execabs.go → ...endor/golang.org/x/sys/execabs/execabs.go
diff --git a/...golang.org/x/sys/execabs/execabs_go118.go → ...golang.org/x/sys/execabs/execabs_go118.go b/...golang.org/x/sys/execabs/execabs_go118.go → ...golang.org/x/sys/execabs/execabs_go118.go
diff --git a/...golang.org/x/sys/execabs/execabs_go119.go → ...golang.org/x/sys/execabs/execabs_go119.go b/...golang.org/x/sys/execabs/execabs_go119.go → ...golang.org/x/sys/execabs/execabs_go119.go
diff --git a/go/vendor/golang.org/x/tools/LICENSE → ...tractor/vendor/golang.org/x/tools/LICENSE b/go/vendor/golang.org/x/tools/LICENSE → ...tractor/vendor/golang.org/x/tools/LICENSE
diff --git a/go/vendor/golang.org/x/tools/PATENTS → ...tractor/vendor/golang.org/x/tools/PATENTS b/go/vendor/golang.org/x/tools/PATENTS → ...tractor/vendor/golang.org/x/tools/PATENTS
diff --git a/...g/x/tools/go/gcexportdata/gcexportdata.go → ...g/x/tools/go/gcexportdata/gcexportdata.go b/...g/x/tools/go/gcexportdata/gcexportdata.go → ...g/x/tools/go/gcexportdata/gcexportdata.go
diff --git a/...g.org/x/tools/go/gcexportdata/importer.go → ...g.org/x/tools/go/gcexportdata/importer.go b/...g.org/x/tools/go/gcexportdata/importer.go → ...g.org/x/tools/go/gcexportdata/importer.go
diff --git a/...tools/go/internal/packagesdriver/sizes.go → ...tools/go/internal/packagesdriver/sizes.go b/...tools/go/internal/packagesdriver/sizes.go → ...tools/go/internal/packagesdriver/sizes.go
diff --git a/...dor/golang.org/x/tools/go/packages/doc.go → ...dor/golang.org/x/tools/go/packages/doc.go b/...dor/golang.org/x/tools/go/packages/doc.go → ...dor/golang.org/x/tools/go/packages/doc.go
diff --git a/...olang.org/x/tools/go/packages/external.go → ...olang.org/x/tools/go/packages/external.go b/...olang.org/x/tools/go/packages/external.go → ...olang.org/x/tools/go/packages/external.go
diff --git a/.../golang.org/x/tools/go/packages/golist.go → .../golang.org/x/tools/go/packages/golist.go b/.../golang.org/x/tools/go/packages/golist.go → .../golang.org/x/tools/go/packages/golist.go
diff --git a/...org/x/tools/go/packages/golist_overlay.go → ...org/x/tools/go/packages/golist_overlay.go b/...org/x/tools/go/packages/golist_overlay.go → ...org/x/tools/go/packages/golist_overlay.go
diff --git a/...rg/x/tools/go/packages/loadmode_string.go → ...rg/x/tools/go/packages/loadmode_string.go b/...rg/x/tools/go/packages/loadmode_string.go → ...rg/x/tools/go/packages/loadmode_string.go
diff --git a/...olang.org/x/tools/go/packages/packages.go → ...olang.org/x/tools/go/packages/packages.go b/...olang.org/x/tools/go/packages/packages.go → ...olang.org/x/tools/go/packages/packages.go
diff --git a/...r/golang.org/x/tools/go/packages/visit.go → ...r/golang.org/x/tools/go/packages/visit.go b/...r/golang.org/x/tools/go/packages/visit.go → ...r/golang.org/x/tools/go/packages/visit.go
diff --git a/...x/tools/go/types/objectpath/objectpath.go → ...x/tools/go/types/objectpath/objectpath.go b/...x/tools/go/types/objectpath/objectpath.go → ...x/tools/go/types/objectpath/objectpath.go
diff --git a/....org/x/tools/internal/event/core/event.go → ....org/x/tools/internal/event/core/event.go b/....org/x/tools/internal/event/core/event.go → ....org/x/tools/internal/event/core/event.go
diff --git a/...org/x/tools/internal/event/core/export.go → ...org/x/tools/internal/event/core/export.go b/...org/x/tools/internal/event/core/export.go → ...org/x/tools/internal/event/core/export.go
diff --git a/...g.org/x/tools/internal/event/core/fast.go → ...g.org/x/tools/internal/event/core/fast.go b/...g.org/x/tools/internal/event/core/fast.go → ...g.org/x/tools/internal/event/core/fast.go
diff --git a/.../golang.org/x/tools/internal/event/doc.go → .../golang.org/x/tools/internal/event/doc.go b/.../golang.org/x/tools/internal/event/doc.go → .../golang.org/x/tools/internal/event/doc.go
diff --git a/...olang.org/x/tools/internal/event/event.go → ...olang.org/x/tools/internal/event/event.go b/...olang.org/x/tools/internal/event/event.go → ...olang.org/x/tools/internal/event/event.go
diff --git a/...g.org/x/tools/internal/event/keys/keys.go → ...g.org/x/tools/internal/event/keys/keys.go b/...g.org/x/tools/internal/event/keys/keys.go → ...g.org/x/tools/internal/event/keys/keys.go
diff --git a/...g/x/tools/internal/event/keys/standard.go → ...g/x/tools/internal/event/keys/standard.go b/...g/x/tools/internal/event/keys/standard.go → ...g/x/tools/internal/event/keys/standard.go
diff --git a/...org/x/tools/internal/event/label/label.go → ...org/x/tools/internal/event/label/label.go b/...org/x/tools/internal/event/label/label.go → ...org/x/tools/internal/event/label/label.go
diff --git a/...ang.org/x/tools/internal/event/tag/tag.go → ...ang.org/x/tools/internal/event/tag/tag.go b/...ang.org/x/tools/internal/event/tag/tag.go → ...ang.org/x/tools/internal/event/tag/tag.go
diff --git a/...rg/x/tools/internal/gcimporter/bimport.go → ...rg/x/tools/internal/gcimporter/bimport.go b/...rg/x/tools/internal/gcimporter/bimport.go → ...rg/x/tools/internal/gcimporter/bimport.go
diff --git a/...x/tools/internal/gcimporter/exportdata.go → ...x/tools/internal/gcimporter/exportdata.go b/...x/tools/internal/gcimporter/exportdata.go → ...x/tools/internal/gcimporter/exportdata.go
diff --git a/...x/tools/internal/gcimporter/gcimporter.go → ...x/tools/internal/gcimporter/gcimporter.go b/...x/tools/internal/gcimporter/gcimporter.go → ...x/tools/internal/gcimporter/gcimporter.go
diff --git a/...rg/x/tools/internal/gcimporter/iexport.go → ...rg/x/tools/internal/gcimporter/iexport.go b/...rg/x/tools/internal/gcimporter/iexport.go → ...rg/x/tools/internal/gcimporter/iexport.go
diff --git a/...rg/x/tools/internal/gcimporter/iimport.go → ...rg/x/tools/internal/gcimporter/iimport.go b/...rg/x/tools/internal/gcimporter/iimport.go → ...rg/x/tools/internal/gcimporter/iimport.go
diff --git a/...ols/internal/gcimporter/newInterface10.go → ...ols/internal/gcimporter/newInterface10.go b/...ols/internal/gcimporter/newInterface10.go → ...ols/internal/gcimporter/newInterface10.go
diff --git a/...ols/internal/gcimporter/newInterface11.go → ...ols/internal/gcimporter/newInterface11.go b/...ols/internal/gcimporter/newInterface11.go → ...ols/internal/gcimporter/newInterface11.go
diff --git a/...ools/internal/gcimporter/support_go117.go → ...ools/internal/gcimporter/support_go117.go b/...ools/internal/gcimporter/support_go117.go → ...ools/internal/gcimporter/support_go117.go
diff --git a/...ools/internal/gcimporter/support_go118.go → ...ools/internal/gcimporter/support_go118.go b/...ools/internal/gcimporter/support_go118.go → ...ools/internal/gcimporter/support_go118.go
diff --git a/...x/tools/internal/gcimporter/unified_no.go → ...x/tools/internal/gcimporter/unified_no.go b/...x/tools/internal/gcimporter/unified_no.go → ...x/tools/internal/gcimporter/unified_no.go
diff --git a/.../tools/internal/gcimporter/unified_yes.go → .../tools/internal/gcimporter/unified_yes.go b/.../tools/internal/gcimporter/unified_yes.go → .../tools/internal/gcimporter/unified_yes.go
diff --git a/...x/tools/internal/gcimporter/ureader_no.go → ...x/tools/internal/gcimporter/ureader_no.go b/...x/tools/internal/gcimporter/ureader_no.go → ...x/tools/internal/gcimporter/ureader_no.go
diff --git a/.../tools/internal/gcimporter/ureader_yes.go → .../tools/internal/gcimporter/ureader_yes.go b/.../tools/internal/gcimporter/ureader_yes.go → .../tools/internal/gcimporter/ureader_yes.go
diff --git a/....org/x/tools/internal/gocommand/invoke.go → ....org/x/tools/internal/gocommand/invoke.go b/....org/x/tools/internal/gocommand/invoke.go → ....org/x/tools/internal/gocommand/invoke.go
diff --git a/....org/x/tools/internal/gocommand/vendor.go → ....org/x/tools/internal/gocommand/vendor.go b/....org/x/tools/internal/gocommand/vendor.go → ....org/x/tools/internal/gocommand/vendor.go
diff --git a/...org/x/tools/internal/gocommand/version.go → ...org/x/tools/internal/gocommand/version.go b/...org/x/tools/internal/gocommand/version.go → ...org/x/tools/internal/gocommand/version.go
diff --git a/...ols/internal/packagesinternal/packages.go → ...ols/internal/packagesinternal/packages.go b/...ols/internal/packagesinternal/packages.go → ...ols/internal/packagesinternal/packages.go
diff --git a/...ang.org/x/tools/internal/pkgbits/codes.go → ...ang.org/x/tools/internal/pkgbits/codes.go b/...ang.org/x/tools/internal/pkgbits/codes.go → ...ang.org/x/tools/internal/pkgbits/codes.go
diff --git a/...g.org/x/tools/internal/pkgbits/decoder.go → ...g.org/x/tools/internal/pkgbits/decoder.go b/...g.org/x/tools/internal/pkgbits/decoder.go → ...g.org/x/tools/internal/pkgbits/decoder.go
diff --git a/...olang.org/x/tools/internal/pkgbits/doc.go → ...olang.org/x/tools/internal/pkgbits/doc.go b/...olang.org/x/tools/internal/pkgbits/doc.go → ...olang.org/x/tools/internal/pkgbits/doc.go
diff --git a/...g.org/x/tools/internal/pkgbits/encoder.go → ...g.org/x/tools/internal/pkgbits/encoder.go b/...g.org/x/tools/internal/pkgbits/encoder.go → ...g.org/x/tools/internal/pkgbits/encoder.go
diff --git a/...ang.org/x/tools/internal/pkgbits/flags.go → ...ang.org/x/tools/internal/pkgbits/flags.go b/...ang.org/x/tools/internal/pkgbits/flags.go → ...ang.org/x/tools/internal/pkgbits/flags.go
diff --git a/...rg/x/tools/internal/pkgbits/frames_go1.go → ...rg/x/tools/internal/pkgbits/frames_go1.go b/...rg/x/tools/internal/pkgbits/frames_go1.go → ...rg/x/tools/internal/pkgbits/frames_go1.go
diff --git a/...g/x/tools/internal/pkgbits/frames_go17.go → ...g/x/tools/internal/pkgbits/frames_go17.go b/...g/x/tools/internal/pkgbits/frames_go17.go → ...g/x/tools/internal/pkgbits/frames_go17.go
diff --git a/...ang.org/x/tools/internal/pkgbits/reloc.go → ...ang.org/x/tools/internal/pkgbits/reloc.go b/...ang.org/x/tools/internal/pkgbits/reloc.go → ...ang.org/x/tools/internal/pkgbits/reloc.go
diff --git a/...g.org/x/tools/internal/pkgbits/support.go → ...g.org/x/tools/internal/pkgbits/support.go b/...g.org/x/tools/internal/pkgbits/support.go → ...g.org/x/tools/internal/pkgbits/support.go
diff --git a/...lang.org/x/tools/internal/pkgbits/sync.go → ...lang.org/x/tools/internal/pkgbits/sync.go b/...lang.org/x/tools/internal/pkgbits/sync.go → ...lang.org/x/tools/internal/pkgbits/sync.go
diff --git a/...ols/internal/pkgbits/syncmarker_string.go → ...ols/internal/pkgbits/syncmarker_string.go b/...ols/internal/pkgbits/syncmarker_string.go → ...ols/internal/pkgbits/syncmarker_string.go
diff --git a/...s/internal/tokeninternal/tokeninternal.go → ...s/internal/tokeninternal/tokeninternal.go b/...s/internal/tokeninternal/tokeninternal.go → ...s/internal/tokeninternal/tokeninternal.go
diff --git a/...org/x/tools/internal/typeparams/common.go → ...org/x/tools/internal/typeparams/common.go b/...org/x/tools/internal/typeparams/common.go → ...org/x/tools/internal/typeparams/common.go
diff --git a/...g/x/tools/internal/typeparams/coretype.go → ...g/x/tools/internal/typeparams/coretype.go b/...g/x/tools/internal/typeparams/coretype.go → ...g/x/tools/internal/typeparams/coretype.go
diff --git a/...ools/internal/typeparams/enabled_go117.go → ...ools/internal/typeparams/enabled_go117.go b/...ools/internal/typeparams/enabled_go117.go → ...ools/internal/typeparams/enabled_go117.go
diff --git a/...ools/internal/typeparams/enabled_go118.go → ...ools/internal/typeparams/enabled_go118.go b/...ools/internal/typeparams/enabled_go118.go → ...ools/internal/typeparams/enabled_go118.go
diff --git a/.../x/tools/internal/typeparams/normalize.go → .../x/tools/internal/typeparams/normalize.go b/.../x/tools/internal/typeparams/normalize.go → .../x/tools/internal/typeparams/normalize.go
diff --git a/...g/x/tools/internal/typeparams/termlist.go → ...g/x/tools/internal/typeparams/termlist.go b/...g/x/tools/internal/typeparams/termlist.go → ...g/x/tools/internal/typeparams/termlist.go
diff --git a/...s/internal/typeparams/typeparams_go117.go → ...s/internal/typeparams/typeparams_go117.go b/...s/internal/typeparams/typeparams_go117.go → ...s/internal/typeparams/typeparams_go117.go
diff --git a/...s/internal/typeparams/typeparams_go118.go → ...s/internal/typeparams/typeparams_go118.go b/...s/internal/typeparams/typeparams_go118.go → ...s/internal/typeparams/typeparams_go118.go
diff --git a/...g/x/tools/internal/typeparams/typeterm.go → ...g/x/tools/internal/typeparams/typeterm.go b/...g/x/tools/internal/typeparams/typeterm.go → ...g/x/tools/internal/typeparams/typeterm.go
diff --git a/...tools/internal/typesinternal/errorcode.go → ...tools/internal/typesinternal/errorcode.go b/...tools/internal/typesinternal/errorcode.go → ...tools/internal/typesinternal/errorcode.go
diff --git a/...nternal/typesinternal/errorcode_string.go → ...nternal/typesinternal/errorcode_string.go b/...nternal/typesinternal/errorcode_string.go → ...nternal/typesinternal/errorcode_string.go
diff --git a/...ools/internal/typesinternal/objectpath.go → ...ools/internal/typesinternal/objectpath.go b/...ools/internal/typesinternal/objectpath.go → ...ools/internal/typesinternal/objectpath.go
diff --git a/...g/x/tools/internal/typesinternal/types.go → ...g/x/tools/internal/typesinternal/types.go b/...g/x/tools/internal/typesinternal/types.go → ...g/x/tools/internal/typesinternal/types.go
diff --git a/...tools/internal/typesinternal/types_118.go → ...tools/internal/typesinternal/types_118.go b/...tools/internal/typesinternal/types_118.go → ...tools/internal/typesinternal/types_118.go
diff --git a/go/vendor/modules.txt → go/extractor/vendor/modules.txt b/go/vendor/modules.txt → go/extractor/vendor/modules.txt
diff --git a/go/ql/test/go.mod b/go/ql/test/go.mod
@@ -0,0 +1,4 @@
+module github.com/github/codeql-go/ql/test
+
+go 1.21
+
diff --git a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
@@ -1 +1,2 @@
+| ../../go.mod:0:0:0:0 | ../../go.mod |  |
 | util.go:0:0:0:0 | util.go |  |
diff --git a/go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go b/go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		module github.com/github/codeql-go/ql/test

		go 1.21
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		\| ../../go.mod:0:0:0:0 \| ../../go.mod \| \|
		\| util.go:0:0:0:0 \| util.go \| \|