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.

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

[chore] switch over githubgen to the one built with our tools #37397

Merged
merged 1 commit into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 6 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,13 @@ generate: install-tools
PATH="$$PWD/.tools:$$PATH" $(MAKE) for-all CMD="$(GOCMD) generate ./..."
$(MAKE) gofmt

.PHONY: githubgen-install
githubgen-install:
cd cmd/githubgen && $(GOCMD) install .

.PHONY: gengithub
gengithub: githubgen-install
githubgen
gengithub: $(GITHUBGEN)
$(GITHUBGEN)

.PHONY: gendistributions
gendistributions: githubgen-install
githubgen distributions
gendistributions: $(GITHUBGEN)
$(GITHUBGEN) distributions

.PHONY: update-codeowners
update-codeowners: gengithub generate
Expand Down Expand Up @@ -556,9 +552,8 @@ clean:
find . -type f -name 'builtunitetest.test' -delete

.PHONY: generate-gh-issue-templates
generate-gh-issue-templates:
cd cmd/githubgen && $(GOCMD) install .
githubgen issue-templates
generate-gh-issue-templates: $(GITHUBGEN)
$(GITHUBGEN) issue-templates

.PHONY: checks
checks:
Expand Down
1 change: 1 addition & 0 deletions Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ CHECKFILE := $(TOOLS_BIN_DIR)/checkfile
CROSSLINK := $(TOOLS_BIN_DIR)/crosslink
GOJUNIT := $(TOOLS_BIN_DIR)/go-junit-report
BUILDER := $(TOOLS_BIN_DIR)/builder
GITHUBGEN := $(TOOLS_BIN_DIR)/githubgen
GOFUMPT := $(TOOLS_BIN_DIR)/gofumpt
GOVULNCHECK := $(TOOLS_BIN_DIR)/govulncheck
GCI := $(TOOLS_BIN_DIR)/gci
Expand Down
4 changes: 3 additions & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
go.opentelemetry.io/build-tools/checkfile v0.16.0
go.opentelemetry.io/build-tools/chloggen v0.16.0
go.opentelemetry.io/build-tools/crosslink v0.16.0
go.opentelemetry.io/build-tools/githubgen v0.0.0-20250120111601-b29324c2a9f5
go.opentelemetry.io/build-tools/issuegenerator v0.16.0
go.opentelemetry.io/build-tools/multimod v0.16.0
go.opentelemetry.io/collector/cmd/builder v0.118.0
Expand Down Expand Up @@ -107,7 +108,8 @@ require (
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/go-github/v66 v66.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gordonklaus/ineffassign v0.1.0 // indirect
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
Expand Down
8 changes: 6 additions & 2 deletions internal/tools/go.sum

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

1 change: 1 addition & 0 deletions internal/tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
_ "go.opentelemetry.io/build-tools/checkfile"
_ "go.opentelemetry.io/build-tools/chloggen"
_ "go.opentelemetry.io/build-tools/crosslink"
_ "go.opentelemetry.io/build-tools/githubgen"
_ "go.opentelemetry.io/build-tools/issuegenerator"
_ "go.opentelemetry.io/build-tools/multimod"
_ "go.opentelemetry.io/collector/cmd/builder"
Expand Down
Loading