From 938bb022d0c1c10162e3531aa941980ecf351276 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Wed, 10 May 2023 08:51:25 -0600 Subject: [PATCH 1/2] Add GOBIN for protoc binaries installs: This puts the protoc binaries in our `bin` directory so that they are available when we update the PATH at the top of the Makefile. Signed-off-by: Jacob Weinstock --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index df56acd9d..cf7c5fb79 100644 --- a/Makefile +++ b/Makefile @@ -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) \ No newline at end of file + GOBIN=$${PWD}/bin $(GO) install $(PROTOC_GEN_GO) + GOBIN=$${PWD}/bin $(GO) install $(PROTOC_GEN_GO_GRPC) From 810a039b750ebdad52a3d1116a366f66645d1efc Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Wed, 10 May 2023 09:01:44 -0600 Subject: [PATCH 2/2] Fix running make ci-checks in docker: These deps were missing when running in docker and could be missing for users that have nix-shell already installed. Signed-off-by: Jacob Weinstock --- shell.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell.nix b/shell.nix index 31c02667a..c109f2dfe 100644 --- a/shell.nix +++ b/shell.nix @@ -11,6 +11,8 @@ with pkgs; mkShell { buildInputs = [ + git + gnumake jq nixfmt nodePackages.prettier