-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
integration-tests: restore original module name; remove self-replace (#…
…1478) ## Motivation The module import path for `integration-tests` was split brained between: - github.com/smartcontractkit/chainlink/integration-tests - github.com/smartcontractkit/ccip/integration-tests And patched with a self-replace: ``` github.com/smartcontractkit/chainlink/integration-tests => ../integration-tests ``` Which was breaking `gomods` ## Solution This PR removes the replace and restores the original import path, and re-enables gomods.
- Loading branch information
Showing
5 changed files
with
15 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,12 +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 | ||
gomodtidy: gomods ## Run go mod tidy on all modules. | ||
gomods tidy | ||
|
||
.PHONY: docs | ||
docs: ## Install and run pkgsite to view Go docs | ||
|
@@ -93,12 +89,8 @@ abigen: ## Build & install abigen. | |
./tools/bin/build_abigen | ||
|
||
.PHONY: generate | ||
generate: pnpmdep 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 ./... | ||
generate: pnpmdep abigen codecgen mockery protoc gomods ## Execute all go:generate commands. | ||
gomods -w go generate -x ./... | ||
mockery | ||
|
||
.PHONY: rm-mocked | ||
|
@@ -140,7 +132,7 @@ presubmit: ## Format go files and imports. | |
|
||
.PHONY: gomods | ||
gomods: ## Install gomods | ||
go install github.com/jmank88/[email protected].1 | ||
go install github.com/jmank88/[email protected].5 | ||
|
||
.PHONY: mockery | ||
mockery: $(mockery) ## Install mockery. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters