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

[chore] adopt GCI to manage imports #17585

Merged
merged 5 commits into from
Jan 19, 2023
Merged

[chore] adopt GCI to manage imports #17585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a52635
[chore] adopt GCI to manage imports
atoulme Jan 15, 2023
ae5ea2b
fix top comment being removed
atoulme Jan 17, 2023
3519012
remove impi make target, remove gogci and gci make targets, and add g…
atoulme Jan 18, 2023
66a806c
remove impi
atoulme Jan 18, 2023
4cd47db
adopt golangci-lint
atoulme Jan 19, 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
Prev Previous commit
Next Next commit
remove impi
  • Loading branch information
@atoulme
atoulme committed Jan 19, 2023
commit 66a806cf8e2dabd6b19f48a43e928fc29e891a35
21 changes: 1 addition & 20 deletions Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ GOCMD?= go
GOTEST=$(GOCMD) test
GOOS=$(shell $(GOCMD) env GOOS)
GOARCH=$(shell $(GOCMD) env GOARCH)
<<<<<<< HEAD

# In order to help reduce toil related to managing tooling for the open telemetry collector
# this section of the makefile looks at only requiring command definitions to be defined
Expand All @@ -49,7 +48,6 @@ MDLINKCHECK := $(TOOLS_BIN_DIR)/markdown-link-check
MISSPELL := $(TOOLS_BIN_DIR)/misspell -error
MISSPELL_CORRECTION := $(TOOLS_BIN_DIR)/misspell -w
LINT := $(TOOLS_BIN_DIR)/golangci-lint
IMPI := $(TOOLS_BIN_DIR)/impi
MULITMOD := $(TOOLS_BIN_DIR)/multimod
CHLOGGEN := $(TOOLS_BIN_DIR)/chloggen
GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
Expand All @@ -58,15 +56,6 @@ CHECKDOC := $(TOOLS_BIN_DIR)/checkdoc
CROSSLINK := $(TOOLS_BIN_DIR)/crosslink
GOJUNIT := $(TOOLS_BIN_DIR)/go-junit-report

=======
ADDLICENCESE= addlicense
MDLINKCHECK=markdown-link-check
MISSPELL=misspell -error
MISSPELL_CORRECTION=misspell -w
LINT=golangci-lint
IMPI=impi
GCI=gci
>>>>>>> 59406ce0e1 ([chore] adopt GCI to manage imports)
# BUILD_TYPE should be one of (dev, release).
BUILD_TYPE?=release
RUNNING_ON_GITHUB_ACTION=$(GITHUB_ACTIONS)
Expand Down Expand Up @@ -101,7 +90,7 @@ all-pkg-dirs:
.DEFAULT_GOAL := common

.PHONY: common
common: checklicense impi lint misspell
common: checklicense lint misspell

.PHONY: test
test:
Expand Down Expand Up @@ -190,14 +179,6 @@ misspell: $(TOOLS_BIN_DIR)/misspell
misspell-correction: $(TOOLS_BIN_DIR)/misspell
$(MISSPELL_CORRECTION) $(ALL_SRC_AND_DOC)

.PHONY: impi
impi: $(IMPI)
@$(IMPI) --local github.com/open-telemetry/opentelemetry-collector-contrib --scheme stdThirdPartyLocal ./...

.PHONY: gci
gci:
@$(GCI) write ./ -s standard -s default -s "prefix(github.com/open-telemetry/opentelemetry-collector-contrib)"

.PHONY: moddownload
moddownload:
$(GOCMD) mod download
Expand Down
1 change: 0 additions & 1 deletion internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/google/addlicense v1.1.0
github.com/jcchavezs/porto v0.4.0
github.com/jstemmer/go-junit-report v1.0.0
github.com/pavius/impi v0.0.3
github.com/tcnksm/ghr v0.16.0
go.opentelemetry.io/build-tools/checkdoc v0.4.0
go.opentelemetry.io/build-tools/chloggen v0.3.0
Expand Down
2 changes: 0 additions & 2 deletions internal/tools/go.sum
View file
Open in desktop

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

1 change: 0 additions & 1 deletion internal/tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
_ "github.com/google/addlicense"
_ "github.com/jcchavezs/porto/cmd/porto"
_ "github.com/jstemmer/go-junit-report"
_ "github.com/pavius/impi/cmd/impi"
_ "github.com/tcnksm/ghr"
_ "go.opentelemetry.io/build-tools/checkdoc"
_ "go.opentelemetry.io/build-tools/chloggen"
Expand Down