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

clean up: use only goimports with golangci-lint #1030

Merged
merged 1 commit into from
Oct 24, 2024
Merged

clean up: use only goimports with golangci-lint #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

SHELL := /bin/bash
BINDIR := bin
PKG := github.com/envoyproxy/go-control-plane
PKG := github.com/envoyproxy/go-control-plane

.PHONY: build
build:
Expand All @@ -30,10 +30,6 @@ test:
cover:
@build/coverage.sh

.PHONY: format
format:
@goimports -local $(PKG) -w -l pkg

.PHONY: examples
examples:
@pushd examples/dyplomat && go build ./... && popd
Expand Down
8 changes: 0 additions & 8 deletions build/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,8 @@ set -x
# Needed to avoid issues with go version stamping in CI build
git config --global --add safe.directory /go-control-plane

go install golang.org/x/tools/cmd/goimports@latest

cd /go-control-plane

NUM_DIFF_LINES=`/go/bin/goimports -local github.com/envoyproxy/go-control-plane -d pkg | wc -l`
if [[ $NUM_DIFF_LINES > 0 ]]; then
echo "Failed format check. Run make format"
exit 1
fi

make build
make bin/example
make examples
Expand Down