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

*: remove gogoproto #2

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

*: remove gogoproto #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6939b69
*: remove gogoproto
GiedriusS Nov 10, 2021
0c3f193
genproto: generation fixes
GiedriusS Nov 24, 2021
b0b104e
fix import f any.proto file
rahulii Dec 1, 2021
395e968
fix proto-gen
rahulii Dec 1, 2021
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
8 changes: 7 additions & 1 deletion .bingo/Variables.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.3. DO NOT EDIT.
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
GOPATH ?= $(shell go env GOPATH)
Expand Down Expand Up @@ -129,6 +129,12 @@ $(PROMU): $(BINGO_DIR)/promu.mod
@echo "(re)installing $(GOBIN)/promu-v0.5.0"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=promu.mod -o=$(GOBIN)/promu-v0.5.0 "github.com/prometheus/promu"

PROTOC_GEN_GO := $(GOBIN)/protoc-gen-go
$(PROTOC_GEN_GO): $(BINGO_DIR)/protoc-gen-go.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/protoc-gen-go
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.5.2 "github.com/golang/protobuf/protoc-gen-go"

PROTOC_GEN_GOGOFAST := $(GOBIN)/protoc-gen-gogofast-v1.3.2
$(PROTOC_GEN_GOGOFAST): $(BINGO_DIR)/protoc-gen-gogofast.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
Expand Down
5 changes: 5 additions & 0 deletions .bingo/protoc-gen-go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.17

require github.com/golang/protobuf v1.5.2 // protoc-gen-go
4 changes: 3 additions & 1 deletion .bingo/variables.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.3. DO NOT EDIT.
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
# Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
GOBIN=${GOBIN:=$(go env GOBIN)}
Expand Down Expand Up @@ -44,6 +44,8 @@ PROMTOOL="${GOBIN}/promtool-v1.8.2-0.20200522113006-f4dd45609a05"

PROMU="${GOBIN}/promu-v0.5.0"

PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.5.2"

PROTOC_GEN_GOGOFAST="${GOBIN}/protoc-gen-gogofast-v1.3.2"

SHFMT="${GOBIN}/shfmt-v3.1.2"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pkg/ui/static/react

tmp/bin
examples/tmp/
/tmp/proto/

# Ignore the MacOS Trash (DS-Store)
.DS_Store
1 change: 1 addition & 0 deletions .vscode/configurationCache.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
8 changes: 8 additions & 0 deletions .vscode/dryrun.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
make --dry-run --always-make --keep-going --print-directory
make: Entering directory '/home/infracloud/Desktop/thanos'

# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
echo "(re)installing /home/infracloud/go/bin/alertmanager-v0.20.0"
cd .bingo/ && /usr/local/go/bin/go build -mod=mod -modfile=alertmanager.mod -o=/home/infracloud/go/bin/alertmanager-v0.20.0 "github.com/prometheus/alertmanager/cmd/alertmanager"
make: Leaving directory '/home/infracloud/Desktop/thanos'

Loading