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

Add GOBIN for protoc binaries installs: #729

Merged
merged 2 commits into from
May 13, 2023
Merged

Add GOBIN for protoc binaries installs: #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
938bb02
Add GOBIN for protoc binaries installs:
jacobweinstock May 10, 2023
810a039
Fix running make ci-checks in docker:
jacobweinstock May 10, 2023
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,5 @@ yamllint: $(YAMLLINT_BIN)

.PHONY: _protoc ## Install all required tools for use with this Makefile.
_protoc:
$(GO) install $(PROTOC_GEN_GO)
$(GO) install $(PROTOC_GEN_GO_GRPC)
GOBIN=$${PWD}/bin $(GO) install $(PROTOC_GEN_GO)
Copy link
Member

@chrisdoherty4 chrisdoherty4 May 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think make generate-proto will find these binaries unless someone adds $PWD/bin so their path.

I'd be keen to stick them under out/bin or out/tools also. I intend on moving the binaries we build to out/bin at some point so we have easy clean up. This compliments the existing out stuff we have for linters and releasing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the makefile does add $PWD/bin to the PATH.

tink/Makefile

Line 4 in eef6545

PATH := $(PATH):$(PWD)/bin

GOBIN=$${PWD}/bin $(GO) install $(PROTOC_GEN_GO_GRPC)
2 changes: 2 additions & 0 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ with pkgs;

mkShell {
buildInputs = [
git
gnumake
jq
nixfmt
nodePackages.prettier
Expand Down