Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Go: Move go.mod into extractor subdirectory #14439

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Go: Move go.mod into extractor subdirectory #14439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b0bc1
Move `go.mod` into `extractor` directory
mbg Oct 11, 2023
7d7d90e
Update expected test output
mbg Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions go/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion go/go.mod → go/extractor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/github/codeql-go
module github.com/github/codeql-go/extractor

go 1.21

Expand Down
0 go/go.sum → go/extractor/go.sum
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/LICENSE → go/extractor/vendor/golang.org/x/mod/LICENSE
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/PATENTS → go/extractor/vendor/golang.org/x/mod/PATENTS
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/mod/internal/lazyregexp/lazyre.go → ...g.org/x/mod/internal/lazyregexp/lazyre.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/modfile/print.go → .../vendor/golang.org/x/mod/modfile/print.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/modfile/read.go → ...r/vendor/golang.org/x/mod/modfile/read.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/modfile/rule.go → ...r/vendor/golang.org/x/mod/modfile/rule.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/modfile/work.go → ...r/vendor/golang.org/x/mod/modfile/work.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/module/module.go → .../vendor/golang.org/x/mod/module/module.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/module/pseudo.go → .../vendor/golang.org/x/mod/module/pseudo.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/mod/semver/semver.go → .../vendor/golang.org/x/mod/semver/semver.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/sys/LICENSE → go/extractor/vendor/golang.org/x/sys/LICENSE
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/sys/PATENTS → go/extractor/vendor/golang.org/x/sys/PATENTS
View file
Open in desktop
File renamed without changes.
0 ...endor/golang.org/x/sys/execabs/execabs.go → ...endor/golang.org/x/sys/execabs/execabs.go
View file
Open in desktop
File renamed without changes.
0 ...golang.org/x/sys/execabs/execabs_go118.go → ...golang.org/x/sys/execabs/execabs_go118.go
View file
Open in desktop
File renamed without changes.
0 ...golang.org/x/sys/execabs/execabs_go119.go → ...golang.org/x/sys/execabs/execabs_go119.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/tools/LICENSE → ...tractor/vendor/golang.org/x/tools/LICENSE
View file
Open in desktop
File renamed without changes.
0 go/vendor/golang.org/x/tools/PATENTS → ...tractor/vendor/golang.org/x/tools/PATENTS
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/go/gcexportdata/gcexportdata.go → ...g/x/tools/go/gcexportdata/gcexportdata.go
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/tools/go/gcexportdata/importer.go → ...g.org/x/tools/go/gcexportdata/importer.go
View file
Open in desktop
File renamed without changes.
0 ...tools/go/internal/packagesdriver/sizes.go → ...tools/go/internal/packagesdriver/sizes.go
View file
Open in desktop
File renamed without changes.
0 ...dor/golang.org/x/tools/go/packages/doc.go → ...dor/golang.org/x/tools/go/packages/doc.go
View file
Open in desktop
File renamed without changes.
0 ...olang.org/x/tools/go/packages/external.go → ...olang.org/x/tools/go/packages/external.go
View file
Open in desktop
File renamed without changes.
0 .../golang.org/x/tools/go/packages/golist.go → .../golang.org/x/tools/go/packages/golist.go
View file
Open in desktop
File renamed without changes.
0 ...org/x/tools/go/packages/golist_overlay.go → ...org/x/tools/go/packages/golist_overlay.go
View file
Open in desktop
File renamed without changes.
0 ...rg/x/tools/go/packages/loadmode_string.go → ...rg/x/tools/go/packages/loadmode_string.go
View file
Open in desktop
File renamed without changes.
0 ...olang.org/x/tools/go/packages/packages.go → ...olang.org/x/tools/go/packages/packages.go
View file
Open in desktop
File renamed without changes.
0 ...r/golang.org/x/tools/go/packages/visit.go → ...r/golang.org/x/tools/go/packages/visit.go
View file
Open in desktop
File renamed without changes.
0 ...x/tools/go/types/objectpath/objectpath.go → ...x/tools/go/types/objectpath/objectpath.go
View file
Open in desktop
File renamed without changes.
0 ....org/x/tools/internal/event/core/event.go → ....org/x/tools/internal/event/core/event.go
View file
Open in desktop
File renamed without changes.
0 ...org/x/tools/internal/event/core/export.go → ...org/x/tools/internal/event/core/export.go
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/tools/internal/event/core/fast.go → ...g.org/x/tools/internal/event/core/fast.go
View file
Open in desktop
File renamed without changes.
0 .../golang.org/x/tools/internal/event/doc.go → .../golang.org/x/tools/internal/event/doc.go
View file
Open in desktop
File renamed without changes.
0 ...olang.org/x/tools/internal/event/event.go → ...olang.org/x/tools/internal/event/event.go
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/tools/internal/event/keys/keys.go → ...g.org/x/tools/internal/event/keys/keys.go
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/internal/event/keys/standard.go → ...g/x/tools/internal/event/keys/standard.go
View file
Open in desktop
File renamed without changes.
0 ...org/x/tools/internal/event/label/label.go → ...org/x/tools/internal/event/label/label.go
View file
Open in desktop
File renamed without changes.
0 ...ang.org/x/tools/internal/event/tag/tag.go → ...ang.org/x/tools/internal/event/tag/tag.go
View file
Open in desktop
File renamed without changes.
0 ...rg/x/tools/internal/gcimporter/bimport.go → ...rg/x/tools/internal/gcimporter/bimport.go
View file
Open in desktop
File renamed without changes.
0 ...x/tools/internal/gcimporter/exportdata.go → ...x/tools/internal/gcimporter/exportdata.go
View file
Open in desktop
File renamed without changes.
0 ...x/tools/internal/gcimporter/gcimporter.go → ...x/tools/internal/gcimporter/gcimporter.go
View file
Open in desktop
File renamed without changes.
0 ...rg/x/tools/internal/gcimporter/iexport.go → ...rg/x/tools/internal/gcimporter/iexport.go
View file
Open in desktop
File renamed without changes.
0 ...rg/x/tools/internal/gcimporter/iimport.go → ...rg/x/tools/internal/gcimporter/iimport.go
View file
Open in desktop
File renamed without changes.
0 ...ols/internal/gcimporter/newInterface10.go → ...ols/internal/gcimporter/newInterface10.go
View file
Open in desktop
File renamed without changes.
0 ...ols/internal/gcimporter/newInterface11.go → ...ols/internal/gcimporter/newInterface11.go
View file
Open in desktop
File renamed without changes.
0 ...ools/internal/gcimporter/support_go117.go → ...ools/internal/gcimporter/support_go117.go
View file
Open in desktop
File renamed without changes.
0 ...ools/internal/gcimporter/support_go118.go → ...ools/internal/gcimporter/support_go118.go
View file
Open in desktop
File renamed without changes.
0 ...x/tools/internal/gcimporter/unified_no.go → ...x/tools/internal/gcimporter/unified_no.go
View file
Open in desktop
File renamed without changes.
0 .../tools/internal/gcimporter/unified_yes.go → .../tools/internal/gcimporter/unified_yes.go
View file
Open in desktop
File renamed without changes.
0 ...x/tools/internal/gcimporter/ureader_no.go → ...x/tools/internal/gcimporter/ureader_no.go
View file
Open in desktop
File renamed without changes.
0 .../tools/internal/gcimporter/ureader_yes.go → .../tools/internal/gcimporter/ureader_yes.go
View file
Open in desktop
File renamed without changes.
0 ....org/x/tools/internal/gocommand/invoke.go → ....org/x/tools/internal/gocommand/invoke.go
View file
Open in desktop
File renamed without changes.
0 ....org/x/tools/internal/gocommand/vendor.go → ....org/x/tools/internal/gocommand/vendor.go
View file
Open in desktop
File renamed without changes.
0 ...org/x/tools/internal/gocommand/version.go → ...org/x/tools/internal/gocommand/version.go
View file
Open in desktop
File renamed without changes.
0 ...ols/internal/packagesinternal/packages.go → ...ols/internal/packagesinternal/packages.go
View file
Open in desktop
File renamed without changes.
0 ...ang.org/x/tools/internal/pkgbits/codes.go → ...ang.org/x/tools/internal/pkgbits/codes.go
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/tools/internal/pkgbits/decoder.go → ...g.org/x/tools/internal/pkgbits/decoder.go
View file
Open in desktop
File renamed without changes.
0 ...olang.org/x/tools/internal/pkgbits/doc.go → ...olang.org/x/tools/internal/pkgbits/doc.go
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/tools/internal/pkgbits/encoder.go → ...g.org/x/tools/internal/pkgbits/encoder.go
View file
Open in desktop
File renamed without changes.
0 ...ang.org/x/tools/internal/pkgbits/flags.go → ...ang.org/x/tools/internal/pkgbits/flags.go
View file
Open in desktop
File renamed without changes.
0 ...rg/x/tools/internal/pkgbits/frames_go1.go → ...rg/x/tools/internal/pkgbits/frames_go1.go
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/internal/pkgbits/frames_go17.go → ...g/x/tools/internal/pkgbits/frames_go17.go
View file
Open in desktop
File renamed without changes.
0 ...ang.org/x/tools/internal/pkgbits/reloc.go → ...ang.org/x/tools/internal/pkgbits/reloc.go
View file
Open in desktop
File renamed without changes.
0 ...g.org/x/tools/internal/pkgbits/support.go → ...g.org/x/tools/internal/pkgbits/support.go
View file
Open in desktop
File renamed without changes.
0 ...lang.org/x/tools/internal/pkgbits/sync.go → ...lang.org/x/tools/internal/pkgbits/sync.go
View file
Open in desktop
File renamed without changes.
0 ...ols/internal/pkgbits/syncmarker_string.go → ...ols/internal/pkgbits/syncmarker_string.go
View file
Open in desktop
File renamed without changes.
0 ...s/internal/tokeninternal/tokeninternal.go → ...s/internal/tokeninternal/tokeninternal.go
View file
Open in desktop
File renamed without changes.
0 ...org/x/tools/internal/typeparams/common.go → ...org/x/tools/internal/typeparams/common.go
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/internal/typeparams/coretype.go → ...g/x/tools/internal/typeparams/coretype.go
View file
Open in desktop
File renamed without changes.
0 ...ools/internal/typeparams/enabled_go117.go → ...ools/internal/typeparams/enabled_go117.go
View file
Open in desktop
File renamed without changes.
0 ...ools/internal/typeparams/enabled_go118.go → ...ools/internal/typeparams/enabled_go118.go
View file
Open in desktop
File renamed without changes.
0 .../x/tools/internal/typeparams/normalize.go → .../x/tools/internal/typeparams/normalize.go
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/internal/typeparams/termlist.go → ...g/x/tools/internal/typeparams/termlist.go
View file
Open in desktop
File renamed without changes.
0 ...s/internal/typeparams/typeparams_go117.go → ...s/internal/typeparams/typeparams_go117.go
View file
Open in desktop
File renamed without changes.
0 ...s/internal/typeparams/typeparams_go118.go → ...s/internal/typeparams/typeparams_go118.go
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/internal/typeparams/typeterm.go → ...g/x/tools/internal/typeparams/typeterm.go
View file
Open in desktop
File renamed without changes.
0 ...tools/internal/typesinternal/errorcode.go → ...tools/internal/typesinternal/errorcode.go
View file
Open in desktop
File renamed without changes.
0 ...nternal/typesinternal/errorcode_string.go → ...nternal/typesinternal/errorcode_string.go
View file
Open in desktop
File renamed without changes.
0 ...ools/internal/typesinternal/objectpath.go → ...ools/internal/typesinternal/objectpath.go
View file
Open in desktop
File renamed without changes.
0 ...g/x/tools/internal/typesinternal/types.go → ...g/x/tools/internal/typesinternal/types.go
View file
Open in desktop
File renamed without changes.
0 ...tools/internal/typesinternal/types_118.go → ...tools/internal/typesinternal/types_118.go
View file
Open in desktop
File renamed without changes.
0 go/vendor/modules.txt → go/extractor/vendor/modules.txt
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions go/ql/test/go.mod
View file
Open in desktop
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

1 change: 1 addition & 0 deletions go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
View file
Open in desktop
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 | |
6 changes: 3 additions & 3 deletions go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading