Skip to content

Commit da30f9a

Browse files
committed
all: remove gojay from all
Signed-off-by: Koichi Shiraishi <[email protected]>
1 parent e71a727 commit da30f9a

File tree

4 files changed

+0
-41
lines changed

4 files changed

+0
-41
lines changed

.circleci/coverage-targets

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

.circleci/lint-buildtags

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

.golangci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,3 @@ issues:
240240
- path: "(client|server)_json.go"
241241
linters:
242242
- nlreturn
243-
- path: _gojay\.go
244-
linters:
245-
- cyclop
246-
- gocyclo
247-
- nlreturn
248-
- path: keys_gojay.go
249-
linters:
250-
- gosec

Makefile

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -54,58 +54,29 @@ test: tools/bin/gotestsum ## Runs package test including race condition.
5454
$(call target)
5555
@CGO_ENABLED=${CGO_ENABLED} ${GO_TEST} ${GO_TEST_FLAGS} -run=${GO_TEST_FUNC} -tags='$(subst $(space),$(comma),${GO_BUILDTAGS})' ${GO_TEST_PKGS}
5656

57-
.PHONY: test/gojay
58-
test/gojay: GO_BUILDTAGS+=gojay
59-
test/gojay: TARGET=test/gojay
60-
test/gojay: test
61-
62-
.PHONY: bench
63-
bench: GO_TEST=go test
64-
bench: ## Take a package benchmark.
65-
$(call target)
66-
@CGO_ENABLED=${CGO_ENABLED} ${GO_TEST} -run='^$$' -bench=${GO_BENCH_FUNC} ${GO_BENCH_FLAGS} $(strip ${GO_FLAGS}) ${GO_TEST_PKGS}
67-
6857
.PHONY: coverage
6958
coverage: CGO_ENABLED=1
7059
coverage: tools/bin/gotestsum ## Takes packages test coverage.
7160
$(call target)
7261
CGO_ENABLED=${CGO_ENABLED} ${GO_TEST} ${GO_TEST_FLAGS} -covermode=atomic -coverpkg=./... -coverprofile=coverage.out $(strip ${GO_FLAGS}) ${GO_PKGS}
7362

74-
.PHONY: coverage/gojay
75-
coverage/gojay: GO_BUILDTAGS+=gojay
76-
coverage/gojay: coverage
77-
7863

7964
##@ fmt, lint
8065

8166
.PHONY: lint
8267
lint: fmt lint/golangci-lint ## Run all linters.
8368

84-
.PHONY: lint
85-
lint/gojay: fmt/gojay lint/golangci-lint/gojay
86-
8769
.PHONY: fmt
8870
fmt: tools/goimportz tools/gofumpt ## Run goimportz and gofumpt.
8971
$(call target)
9072
find . -iname "*.go" -not -path "./vendor/**" | xargs -P ${JOBS} ${TOOLS_BIN}/goimportz -local=${PKG},$(subst /protocol,,$(PKG)) -w
9173
find . -iname "*.go" -not -path "./vendor/**" | xargs -P ${JOBS} ${TOOLS_BIN}/gofumpt -extra -w
9274

93-
.PHONY: fmt/gojay
94-
fmt/gojay: tools/goimportz tools/gofumpt
95-
$(call target)
96-
@export GOFLAGS=-tags=gojay
97-
find . -iname "*.go" -not -path "./vendor/**" | xargs -P ${JOBS} ${TOOLS_BIN}/goimportz -local=${PKG},$(subst /protocol,,$(PKG)) -w
98-
find . -iname "*.go" -not -path "./vendor/**" | xargs -P ${JOBS} ${TOOLS_BIN}/gofumpt -extra -w
99-
10075
.PHONY: lint/golangci-lint
10176
lint/golangci-lint: tools/golangci-lint .golangci.yml ## Run golangci-lint.
10277
$(call target)
10378
${TOOLS_BIN}/golangci-lint -j ${JOBS} run $(strip ${GO_LINT_FLAGS}) ./...
10479

105-
.PHONY: lint/golangci-lint/gojay
106-
lint/golangci-lint/gojay: GO_LINT_FLAGS+=--build-tags=gojay
107-
lint/golangci-lint/gojay: lint/golangci-lint
108-
10980

11081
##@ tools
11182

0 commit comments

Comments
 (0)