Skip to content

Commit 99cd0fe

Browse files
xBazilioxBazilio
authored
Merge branch 'main' into fix_ignored_no_compact_mark
Signed-off-by: Vasiliy Rumyantsev <[email protected]>
2 parents 5b85d1d + 36de497 commit 99cd0fe

File tree

189 files changed

+8016
-2666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+8016
-2666
lines changed

‎.bingo/Variables.mk‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
1+
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.7. DO NOT EDIT.
22
# All tools are designed to be build inside $GOBIN.
33
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
44
GOPATH ?= $(shell go env GOPATH)
@@ -21,125 +21,125 @@ ALERTMANAGER := $(GOBIN)/alertmanager-v0.24.0
2121
$(ALERTMANAGER): $(BINGO_DIR)/alertmanager.mod
2222
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
2323
@echo "(re)installing $(GOBIN)/alertmanager-v0.24.0"
24-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=alertmanager.mod -o=$(GOBIN)/alertmanager-v0.24.0 "github.com/prometheus/alertmanager/cmd/alertmanager"
24+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=alertmanager.mod -o=$(GOBIN)/alertmanager-v0.24.0 "github.com/prometheus/alertmanager/cmd/alertmanager"
2525

2626
BINGO := $(GOBIN)/bingo-v0.6.0
2727
$(BINGO): $(BINGO_DIR)/bingo.mod
2828
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
2929
@echo "(re)installing $(GOBIN)/bingo-v0.6.0"
30-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.6.0 "github.com/bwplotka/bingo"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.6.0 "github.com/bwplotka/bingo"
3131

3232
FAILLINT := $(GOBIN)/faillint-v1.11.0
3333
$(FAILLINT): $(BINGO_DIR)/faillint.mod
3434
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
3535
@echo "(re)installing $(GOBIN)/faillint-v1.11.0"
36-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.11.0 "github.com/fatih/faillint"
36+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.11.0 "github.com/fatih/faillint"
3737

3838
GO_BINDATA := $(GOBIN)/go-bindata-v3.1.1+incompatible
3939
$(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
4040
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
4141
@echo "(re)installing $(GOBIN)/go-bindata-v3.1.1+incompatible"
42-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.1+incompatible "github.com/go-bindata/go-bindata/go-bindata"
42+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.1+incompatible "github.com/go-bindata/go-bindata/go-bindata"
4343

4444
GOIMPORTS := $(GOBIN)/goimports-v0.1.11
4545
$(GOIMPORTS): $(BINGO_DIR)/goimports.mod
4646
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
4747
@echo "(re)installing $(GOBIN)/goimports-v0.1.11"
48-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.1.11 "golang.org/x/tools/cmd/goimports"
48+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.1.11 "golang.org/x/tools/cmd/goimports"
4949

5050
GOJSONTOYAML := $(GOBIN)/gojsontoyaml-v0.1.0
5151
$(GOJSONTOYAML): $(BINGO_DIR)/gojsontoyaml.mod
5252
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
5353
@echo "(re)installing $(GOBIN)/gojsontoyaml-v0.1.0"
54-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=gojsontoyaml.mod -o=$(GOBIN)/gojsontoyaml-v0.1.0 "github.com/brancz/gojsontoyaml"
54+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gojsontoyaml.mod -o=$(GOBIN)/gojsontoyaml-v0.1.0 "github.com/brancz/gojsontoyaml"
5555

56-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.49.0
56+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.1
5757
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
5858
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
59-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.49.0"
60-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.49.0 "github.com/golangci/golangci-lint/cmd/golangci-lint"
59+
@echo "(re)installing $(GOBIN)/golangci-lint-v1.51.1"
60+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.51.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
6161

6262
GOTESPLIT := $(GOBIN)/gotesplit-v0.2.1
6363
$(GOTESPLIT): $(BINGO_DIR)/gotesplit.mod
6464
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
6565
@echo "(re)installing $(GOBIN)/gotesplit-v0.2.1"
66-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=gotesplit.mod -o=$(GOBIN)/gotesplit-v0.2.1 "github.com/Songmu/gotesplit/cmd/gotesplit"
66+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gotesplit.mod -o=$(GOBIN)/gotesplit-v0.2.1 "github.com/Songmu/gotesplit/cmd/gotesplit"
6767

6868
HUGO := $(GOBIN)/hugo-v0.101.0
6969
$(HUGO): $(BINGO_DIR)/hugo.mod
7070
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
7171
@echo "(re)installing $(GOBIN)/hugo-v0.101.0"
72-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.101.0 "github.com/gohugoio/hugo"
72+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.101.0 "github.com/gohugoio/hugo"
7373

7474
JB := $(GOBIN)/jb-v0.5.1
7575
$(JB): $(BINGO_DIR)/jb.mod
7676
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
7777
@echo "(re)installing $(GOBIN)/jb-v0.5.1"
78-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.5.1 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
78+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.5.1 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
7979

8080
JSONNET_LINT := $(GOBIN)/jsonnet-lint-v0.18.0
8181
$(JSONNET_LINT): $(BINGO_DIR)/jsonnet-lint.mod
8282
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
8383
@echo "(re)installing $(GOBIN)/jsonnet-lint-v0.18.0"
84-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnet-lint.mod -o=$(GOBIN)/jsonnet-lint-v0.18.0 "github.com/google/go-jsonnet/cmd/jsonnet-lint"
84+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnet-lint.mod -o=$(GOBIN)/jsonnet-lint-v0.18.0 "github.com/google/go-jsonnet/cmd/jsonnet-lint"
8585

8686
JSONNET := $(GOBIN)/jsonnet-v0.18.0
8787
$(JSONNET): $(BINGO_DIR)/jsonnet.mod
8888
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
8989
@echo "(re)installing $(GOBIN)/jsonnet-v0.18.0"
90-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnet.mod -o=$(GOBIN)/jsonnet-v0.18.0 "github.com/google/go-jsonnet/cmd/jsonnet"
90+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnet.mod -o=$(GOBIN)/jsonnet-v0.18.0 "github.com/google/go-jsonnet/cmd/jsonnet"
9191

9292
JSONNETFMT := $(GOBIN)/jsonnetfmt-v0.18.0
9393
$(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
9494
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
9595
@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.18.0"
96-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.18.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
96+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.18.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
9797

9898
MDOX := $(GOBIN)/mdox-v0.9.1-0.20220713110358-25b9abcf90a0
9999
$(MDOX): $(BINGO_DIR)/mdox.mod
100100
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
101101
@echo "(re)installing $(GOBIN)/mdox-v0.9.1-0.20220713110358-25b9abcf90a0"
102-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.1-0.20220713110358-25b9abcf90a0 "github.com/bwplotka/mdox"
102+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.1-0.20220713110358-25b9abcf90a0 "github.com/bwplotka/mdox"
103103

104104
MINIO := $(GOBIN)/minio-v0.0.0-20220720015624-ce8397f7d944
105105
$(MINIO): $(BINGO_DIR)/minio.mod
106106
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
107107
@echo "(re)installing $(GOBIN)/minio-v0.0.0-20220720015624-ce8397f7d944"
108-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=minio.mod -o=$(GOBIN)/minio-v0.0.0-20220720015624-ce8397f7d944 "github.com/minio/minio"
108+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=minio.mod -o=$(GOBIN)/minio-v0.0.0-20220720015624-ce8397f7d944 "github.com/minio/minio"
109109

110110
PROMDOC := $(GOBIN)/promdoc-v0.8.0
111111
$(PROMDOC): $(BINGO_DIR)/promdoc.mod
112112
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
113113
@echo "(re)installing $(GOBIN)/promdoc-v0.8.0"
114-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=promdoc.mod -o=$(GOBIN)/promdoc-v0.8.0 "github.com/plexsystems/promdoc"
114+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=promdoc.mod -o=$(GOBIN)/promdoc-v0.8.0 "github.com/plexsystems/promdoc"
115115

116116
PROMETHEUS := $(GOBIN)/prometheus-v0.37.0
117117
$(PROMETHEUS): $(BINGO_DIR)/prometheus.mod
118118
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
119119
@echo "(re)installing $(GOBIN)/prometheus-v0.37.0"
120-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=prometheus.mod -o=$(GOBIN)/prometheus-v0.37.0 "github.com/prometheus/prometheus/cmd/prometheus"
120+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=prometheus.mod -o=$(GOBIN)/prometheus-v0.37.0 "github.com/prometheus/prometheus/cmd/prometheus"
121121

122122
PROMTOOL := $(GOBIN)/promtool-v0.37.0
123123
$(PROMTOOL): $(BINGO_DIR)/promtool.mod
124124
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
125125
@echo "(re)installing $(GOBIN)/promtool-v0.37.0"
126-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=promtool.mod -o=$(GOBIN)/promtool-v0.37.0 "github.com/prometheus/prometheus/cmd/promtool"
126+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=promtool.mod -o=$(GOBIN)/promtool-v0.37.0 "github.com/prometheus/prometheus/cmd/promtool"
127127

128128
PROMU := $(GOBIN)/promu-v0.5.0
129129
$(PROMU): $(BINGO_DIR)/promu.mod
130130
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
131131
@echo "(re)installing $(GOBIN)/promu-v0.5.0"
132-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=promu.mod -o=$(GOBIN)/promu-v0.5.0 "github.com/prometheus/promu"
132+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=promu.mod -o=$(GOBIN)/promu-v0.5.0 "github.com/prometheus/promu"
133133

134134
PROTOC_GEN_GOGOFAST := $(GOBIN)/protoc-gen-gogofast-v1.3.2
135135
$(PROTOC_GEN_GOGOFAST): $(BINGO_DIR)/protoc-gen-gogofast.mod
136136
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
137137
@echo "(re)installing $(GOBIN)/protoc-gen-gogofast-v1.3.2"
138-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-gogofast.mod -o=$(GOBIN)/protoc-gen-gogofast-v1.3.2 "github.com/gogo/protobuf/protoc-gen-gogofast"
138+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=protoc-gen-gogofast.mod -o=$(GOBIN)/protoc-gen-gogofast-v1.3.2 "github.com/gogo/protobuf/protoc-gen-gogofast"
139139

140140
SHFMT := $(GOBIN)/shfmt-v3.5.1
141141
$(SHFMT): $(BINGO_DIR)/shfmt.mod
142142
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
143143
@echo "(re)installing $(GOBIN)/shfmt-v3.5.1"
144-
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=shfmt.mod -o=$(GOBIN)/shfmt-v3.5.1 "mvdan.cc/sh/v3/cmd/shfmt"
144+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=shfmt.mod -o=$(GOBIN)/shfmt-v3.5.1 "mvdan.cc/sh/v3/cmd/shfmt"
145145

‎.bingo/golangci-lint.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

33
go 1.14
44

5-
require github.com/golangci/golangci-lint v1.49.0 // cmd/golangci-lint
5+
require github.com/golangci/golangci-lint v1.51.1 // cmd/golangci-lint

0 commit comments

Comments
 (0)