Skip to content

Commit 7a98afe

Browse files
mbgmbg
authored
Merge pull request #14439 from github/mbg/go/workspace-experiments
Go: Move `go.mod` into `extractor` subdirectory
2 parents a4eb3fd + 7d7d90e commit 7a98afe

Some content is hidden

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

88 files changed

+14
-12
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ updates:
1919
update-types: ['version-update:semver-patch', 'version-update:semver-minor']
2020

2121
- package-ecosystem: "gomod"
22-
directory: "go"
22+
directory: "go/extractor"
2323
schedule:
2424
interval: "daily"
25-
allow:
26-
- dependency-name: "golang.org/x/mod"
27-
- dependency-name: "golang.org/x/tools"
2825
reviewers:
2926
- "github/codeql-go"

‎go/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ tools: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))) tools/tokenizer.j
5151

5252
.PHONY: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES)))
5353
$(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))):
54-
go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
54+
go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
5555

5656
tools-codeql: tools-$(CODEQL_PLATFORM)
5757

@@ -61,19 +61,19 @@ tools-linux64: $(addprefix tools/linux64/,$(BINARIES))
6161

6262
.PHONY: $(addprefix tools/linux64/,$(BINARIES))
6363
$(addprefix tools/linux64/,$(BINARIES)):
64-
GOOS=linux GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
64+
GOOS=linux GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
6565

6666
tools-osx64: $(addprefix tools/osx64/,$(BINARIES))
6767

6868
.PHONY: $(addprefix tools/osx64/,$(BINARIES))
6969
$(addprefix tools/osx64/,$(BINARIES)):
70-
GOOS=darwin GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
70+
GOOS=darwin GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
7171

7272
tools-win64: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
7373

7474
.PHONY: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
7575
$(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES))):
76-
env GOOS=windows GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
76+
env GOOS=windows GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
7777

7878
.PHONY: extractor-common extractor extractor-full
7979
extractor-common: codeql-extractor.yml LICENSE ql/lib/go.dbscheme \

go/go.mod renamed to go/extractor/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/github/codeql-go
1+
module github.com/github/codeql-go/extractor
22

33
go 1.21
44

go/go.sum renamed to go/extractor/go.sum

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

go/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go renamed to go/extractor/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go

File renamed without changes.

go/vendor/golang.org/x/mod/modfile/print.go renamed to go/extractor/vendor/golang.org/x/mod/modfile/print.go

File renamed without changes.

go/vendor/golang.org/x/mod/modfile/read.go renamed to go/extractor/vendor/golang.org/x/mod/modfile/read.go

File renamed without changes.

go/vendor/golang.org/x/mod/modfile/rule.go renamed to go/extractor/vendor/golang.org/x/mod/modfile/rule.go

File renamed without changes.

0 commit comments

Comments
 (0)