Skip to content

Commit

Permalink
chore(docker): remove git submodule pull inside build.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
0xfourzerofour committed Oct 30, 2023
1 parent 53e669b commit c54756e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/docker-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v3
with:
submodules: recursive

- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -49,5 +51,4 @@ jobs:
run: |
cargo install cross --git https://github.com/cross-rs/cross
export PROFILE=release
sudo git config --global --add safe.directory '*'
sudo -E env "PATH=$PATH" make docker-build-latest
make docker-build-latest
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ test-spec-integrated: ## Run spec tests in integrated mode
test-spec-modular: ## Run spec tests in modular mode
test/spec-tests/remote/run-spec-tests.sh

.PHONY: submodule-update
submodule-update: ## Run spec tests in modular mode
git submodule update

# Note: The additional rustc compiler flags are for intrinsics needed by MDBX.
# See: https://github.com/cross-rs/cross/wiki/FAQ#undefined-reference-with-build-std
build-%:
Expand Down
9 changes: 0 additions & 9 deletions crates/types/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
println!("cargo:rerun-if-changed=contracts/lib");
println!("cargo:rerun-if-changed=contracts/src");
println!("cargo:rerun-if-changed=contracts/foundry.toml");
update_submodules()?;
generate_contract_bindings()?;
Ok(())
}
Expand Down Expand Up @@ -62,14 +61,6 @@ fn generate_abis() -> Result<(), Box<dyn error::Error>> {
)
}

fn update_submodules() -> Result<(), Box<dyn error::Error>> {
run_command(
Command::new("git").arg("submodule").arg("update"),
"https://github.com/git-guides/install-git",
"update submodules",
)
}

fn run_command(
command: &mut Command,
install_page_url: &str,
Expand Down

0 comments on commit c54756e

Please sign in to comment.