From db46606fa402e78c4141ec1517a294c22e408eff Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Tue, 21 Jan 2025 14:45:55 +0100 Subject: [PATCH 1/4] Minor --- .changeset/poor-adults-tie.md | 5 +++++ GNUmakefile | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/poor-adults-tie.md diff --git a/.changeset/poor-adults-tie.md b/.changeset/poor-adults-tie.md new file mode 100644 index 00000000000..5d1e7b7fc56 --- /dev/null +++ b/.changeset/poor-adults-tie.md @@ -0,0 +1,5 @@ +--- +"chainlink": minor +--- + +#updated Explicitly use protoc installed in the makefile. diff --git a/GNUmakefile b/GNUmakefile index d86b791bbee..22931c7eb69 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -108,6 +108,7 @@ abigen: ## Build & install abigen. .PHONY: generate generate: abigen codecgen mockery protoc gomods ## Execute all go:generate commands. + export PATH=$(HOME)/.local/bin:$(PATH) ## Make sure that go:generate uses protoc installed above gomods -w go generate -x ./... find . -type f -name .mockery.yaml -execdir mockery \; ## Execute mockery for all .mockery.yaml files From 85b78ba6869ef80d530bc915f95705bbb9502cfb Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Tue, 21 Jan 2025 15:07:42 +0100 Subject: [PATCH 2/4] Minor --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 22931c7eb69..e469678d611 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -108,8 +108,8 @@ abigen: ## Build & install abigen. .PHONY: generate generate: abigen codecgen mockery protoc gomods ## Execute all go:generate commands. - export PATH=$(HOME)/.local/bin:$(PATH) ## Make sure that go:generate uses protoc installed above - gomods -w go generate -x ./... + ## Make sure that go:generate uses protoc installed above + export PATH=$(HOME)/.local/bin:$(PATH); gomods -w go generate -x ./... find . -type f -name .mockery.yaml -execdir mockery \; ## Execute mockery for all .mockery.yaml files .PHONY: rm-mocked From b3f26bd800e62e6001698061e7cbb83129eaf7c2 Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Tue, 21 Jan 2025 15:08:53 +0100 Subject: [PATCH 3/4] Minor --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index e469678d611..e1026fb0237 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -108,7 +108,7 @@ abigen: ## Build & install abigen. .PHONY: generate generate: abigen codecgen mockery protoc gomods ## Execute all go:generate commands. - ## Make sure that go:generate uses protoc installed above + ## Exporting PATH makes sure that go:generate uses the version of protoc installed by the protoc make command. export PATH=$(HOME)/.local/bin:$(PATH); gomods -w go generate -x ./... find . -type f -name .mockery.yaml -execdir mockery \; ## Execute mockery for all .mockery.yaml files From 0ce47f55fe0b302cc0bebfbb096f5755673c4eff Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Tue, 21 Jan 2025 15:09:30 +0100 Subject: [PATCH 4/4] Minor --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index e1026fb0237..2ce3ceffa85 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -108,7 +108,7 @@ abigen: ## Build & install abigen. .PHONY: generate generate: abigen codecgen mockery protoc gomods ## Execute all go:generate commands. - ## Exporting PATH makes sure that go:generate uses the version of protoc installed by the protoc make command. + ## Updating PATH makes sure that go:generate uses the version of protoc installed by the protoc make command. export PATH=$(HOME)/.local/bin:$(PATH); gomods -w go generate -x ./... find . -type f -name .mockery.yaml -execdir mockery \; ## Execute mockery for all .mockery.yaml files