Skip to content

Commit b082405

Browse files
committed
chore(make): Uses common actiosn
Signed-off-by: Kemal Akkoyun <[email protected]>
1 parent 34e2afa commit b082405

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

.yamllint

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
extends: default
3+
ignore: |
4+
**/node_modules
5+
6+
rules:
7+
braces:
8+
max-spaces-inside: 1
9+
level: error
10+
brackets:
11+
max-spaces-inside: 1
12+
level: error
13+
commas: disable
14+
comments: disable
15+
comments-indentation: disable
16+
document-start: disable
17+
indentation:
18+
spaces: consistent
19+
indent-sequences: consistent
20+
key-duplicates:
21+
ignore: |
22+
config/testdata/section_key_dup.bad.yml
23+
line-length: disable
24+
truthy:
25+
check-keys: false

Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ BUF_VERSION ?= v1.39.0
1919
$(BUF):
2020
go install github.com/bufbuild/buf/cmd/buf@$(BUF_VERSION)
2121

22+
all: common-all format lint
23+
2224
.PHONY: deps
2325
deps:
2426
$(MAKE) common-deps
@@ -45,7 +47,10 @@ generate-go-collector-test-files:
4547
go mod tidy
4648

4749
.PHONY: fmt
48-
fmt: common-format
50+
fmt: common-format format-yaml fix-crlf
51+
52+
.PHONY: format
53+
format: fmt
4954

5055
.PHONY: proto
5156
proto: ## Regenerate Go from remote write proto.
@@ -80,10 +85,10 @@ format-yaml: $(YAMLFMT)
8085
@echo ">> formatting YAML files"
8186
$(YAMLFMT) -dstar '**/*.yml' '**/*.yaml'
8287

83-
.PHONY: lint-yaml
84-
lint-yaml: $(YAMLFMT)
85-
@echo ">> linting YAML files"
86-
$(YAMLFMT) -lint -dstar '**/*.yml' '**/*.yaml'
88+
.PHONY: lint
89+
lint: common-lint common-vet common-yamllint common-lint-fix lint-actions
90+
91+
lint-yaml: common-yamllint
8792

8893
.PHONY: lint-actions
8994
lint-actions: $(ACTIONLINT)

0 commit comments

Comments
 (0)