Skip to content

Commit 1b0f10a

Browse files
authored
Extract bufstyle to makego (#4071)
1 parent 6749049 commit 1b0f10a

File tree

27 files changed

+44
-953
lines changed

27 files changed

+44
-953
lines changed

.bufstyle.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: v1
2+
ignore:
3+
PACKAGE_FILENAME:
4+
- private/gen

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix/buf-plugin-suffix
2626
private/bufpkg/bufmodule/bufmoduleapi/cmd/buf-legacyfederation-go-data/buf-legacyfederation-go-data
2727
private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-digest/buf-digest
2828
private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-new-commit-id/buf-new-commit-id
29-
private/bufpkg/bufstyle/cmd/bufstyle/bufstyle
3029
private/bufpkg/buftesting/cache/
3130
private/pkg/bandeps/cmd/bandeps/bandeps
3231
private/pkg/git/cmd/git-ls-files-unstaged/git-ls-files-unstaged

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
/private/bufpkg/bufmodule/bufmoduleapi/cmd/buf-legacyfederation-go-data/buf-legacyfederation-go-data
2727
/private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-digest/buf-digest
2828
/private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-new-commit-id/buf-new-commit-id
29-
/private/bufpkg/bufstyle/cmd/bufstyle/bufstyle
3029
/private/bufpkg/buftesting/cache/
3130
/private/pkg/bandeps/cmd/bandeps/bandeps
3231
/private/pkg/git/cmd/git-ls-files-unstaged/git-ls-files-unstaged

make/buf/all.mk

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ GO_BINS := $(GO_BINS) \
88
private/bufpkg/bufmodule/bufmoduleapi/cmd/buf-legacyfederation-go-data \
99
private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-digest \
1010
private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-new-commit-id \
11-
private/bufpkg/bufstyle/cmd/bufstyle \
1211
private/pkg/bandeps/cmd/bandeps \
1312
private/pkg/git/cmd/git-ls-files-unstaged \
1413
private/pkg/storage/cmd/ddiff \
@@ -70,17 +69,11 @@ include make/go/docker.mk
7069
include make/go/license_header.mk
7170
include make/go/bandeps.mk
7271
include make/go/bufprivateusage.mk
72+
include make/go/bufstyle.mk
7373
include make/go/buf.mk
7474

7575
installtest:: $(PROTOC) $(PROTOC_GEN_GO)
7676

77-
.PHONY: bufstyle
78-
bufstyle: installbufstyle
79-
@echo bufstyle NON_GEN_GOPKGS
80-
@bufstyle $(shell go list $(GOPKGS) | grep -v \/gen\/)
81-
82-
postlint:: bufstyle
83-
8477
.PHONY: godata
8578
godata: installwkt-go-data installbuf-legacyfederation-go-data $(PROTOC)
8679
rm -rf private/gen/data/datawkt

make/go/bufstyle.mk

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Managed by makego. DO NOT EDIT.
2+
3+
# Must be set
4+
$(call _assert_var,MAKEGO)
5+
$(call _conditional_include,$(MAKEGO)/base.mk)
6+
$(call _conditional_include,$(MAKEGO)/go.mk)
7+
$(call _conditional_include,make/go/dep_bufstyle.mk)
8+
# Must be set
9+
$(call _assert_var,GOPKGS)
10+
11+
.PHONY: bufstyle
12+
bufstyle: $(BUFSTYLE)
13+
@echo bufstyle GOPKGS
14+
@bufstyle $(GOPKGS)
15+
16+
postlint:: bufstyle

make/go/dep_bufstyle.mk

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Managed by makego. DO NOT EDIT.
2+
3+
# Must be set
4+
$(call _assert_var,MAKEGO)
5+
$(call _conditional_include,$(MAKEGO)/base.mk)
6+
$(call _conditional_include,$(MAKEGO)/dep_buf.mk)
7+
$(call _assert_var,CACHE_VERSIONS)
8+
$(call _assert_var,CACHE_BIN)
9+
$(call _assert_var,BUF_VERSION)
10+
11+
# Settable
12+
# https://github.com/bufbuild/bufstyle-go/releases
13+
BUFSTYLE_VERSION ?= v0.4.0
14+
15+
BUFSTYLE := $(CACHE_VERSIONS)/bufstyle/$(BUFSTYLE_VERSION)
16+
$(BUFSTYLE):
17+
@rm -f $(CACHE_BIN)/bufstyle
18+
GOBIN=$(CACHE_BIN) go install buf.build/go/bufstyle@$(BUFSTYLE_VERSION)
19+
@rm -rf $(dir $(BUFSTYLE))
20+
@mkdir -p $(dir $(BUFSTYLE))
21+
@touch $(BUFSTYLE)
22+
23+
dockerdeps:: $(BUFSTYLE)

private/bufpkg/bufstyle/cmd/bufstyle/main.go

Lines changed: 0 additions & 46 deletions
This file was deleted.

private/bufpkg/bufstyle/cmd/bufstyle/usage.gen.go

Lines changed: 0 additions & 19 deletions
This file was deleted.

private/bufpkg/bufstyle/internal/analyzer_provider.go

Lines changed: 0 additions & 107 deletions
This file was deleted.

private/bufpkg/bufstyle/internal/analyzers/america/america.go

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)