Skip to content

Commit

Permalink
Unblock CI by updating git submodules directly in execution integrati…
Browse files Browse the repository at this point in the history
…on tests (#3479)

## Issue Addressed

Recent changes to the Nethermind codebase removed the `rocksdb` git submodule in favour of a `nuget` package.
This appears to have broken our ability to build the latest release of Nethermind inside our integration tests.

## Proposed Changes

~Temporarily pin the version used for the Nethermind integration tests to `master`. This ensures we use the packaged version of `rocksdb`. This is only necessary until a new release of Nethermind is available.~

Use `git submodule update --init --recursive` to ensure the required submodules are pulled before building.

Co-authored-by: Diva M <[email protected]>
  • Loading branch information
macladson and divagant-martian committed Aug 19, 2022
1 parent c2604c4 commit 726d1b0
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion testing/execution_engine_integration/src/build_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pub fn clone_repo(repo_dir: &Path, repo_url: &str) -> Result<(), String> {
Command::new("git")
.arg("clone")
.arg(repo_url)
.arg("--recursive")
.current_dir(repo_dir)
.output()
.map_err(|_| format!("failed to clone repo at {repo_url}"))?,
Expand All @@ -41,6 +40,21 @@ pub fn checkout(repo_dir: &Path, revision_or_branch: &str) -> Result<(), String>
)
})?,
|_| {},
)?;
output_to_result(
Command::new("git")
.arg("submodule")
.arg("update")
.arg("--init")
.arg("--recursive")
.current_dir(repo_dir)
.output()
.map_err(|_| {
format!(
"failed to update submodules on branch or revision at {repo_dir:?}/{revision_or_branch}",
)
})?,
|_| {},
)
}

Expand Down

0 comments on commit 726d1b0

Please sign in to comment.