From da91d3a517c189e87aa04b56b2d649b8c87be561 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Wed, 12 Jun 2024 11:02:36 -0500 Subject: [PATCH] bump gomods & restore usage (#13502) --- GNUmakefile | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 589e750289f..ee9bc8a6b23 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -27,13 +27,8 @@ gomod: ## Ensure chainlink's go dependencies are installed. go mod download .PHONY: gomodtidy -gomodtidy: ## Run go mod tidy on all modules. - go mod tidy - cd ./core/scripts && go mod tidy - cd ./integration-tests && go mod tidy - cd ./integration-tests/load && go mod tidy - cd ./dashboard-lib && go mod tidy - cd ./crib && go mod tidy +gomodtidy: gomods ## Run go mod tidy on all modules. + gomods tidy .PHONY: docs docs: ## Install and run pkgsite to view Go docs @@ -90,13 +85,8 @@ abigen: ## Build & install abigen. ./tools/bin/build_abigen .PHONY: generate -generate: abigen codecgen mockery protoc ## Execute all go:generate commands. - go generate -x ./... - cd ./core/scripts && go generate -x ./... - cd ./integration-tests && go generate -x ./... - cd ./integration-tests/load && go generate -x ./... - cd ./dashboard-lib && go generate -x ./... - cd ./crib && go generate -x ./... +generate: gomods abigen codecgen mockery protoc ## Execute all go:generate commands. + gomods -w go generate -x ./... .PHONY: testscripts testscripts: chainlink-test ## Install and run testscript against testdata/scripts/* files. @@ -129,7 +119,7 @@ presubmit: ## Format go files and imports. .PHONY: gomods gomods: ## Install gomods - go install github.com/jmank88/gomods@v0.1.0 + go install github.com/jmank88/gomods@v0.1.1 .PHONY: mockery mockery: $(mockery) ## Install mockery.