From f7c6e139b496ea0c5f92327937e86e4a11e44e7a Mon Sep 17 00:00:00 2001 From: 0xevolve Date: Wed, 8 Nov 2023 11:31:11 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/starknet-js-tests.yml | 2 +- .github/workflows/starknet-rpc-tests.yml | 2 +- .gitmodules | 6 ------ crates/node/src/commands/setup.rs | 1 + madara-app | 1 - madara-dev-explorer | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) delete mode 160000 madara-app delete mode 160000 madara-dev-explorer diff --git a/.github/workflows/starknet-js-tests.yml b/.github/workflows/starknet-js-tests.yml index d6d17bd86e..b237187e82 100644 --- a/.github/workflows/starknet-js-tests.yml +++ b/.github/workflows/starknet-js-tests.yml @@ -20,7 +20,7 @@ jobs: fail-on-cache-miss: true - name: Setup dev chain run: | - ./target/release/madara setup --chain=dev --from-remote + ./target/release/madara setup --chain=dev --from-local=configs - name: Run starknet-js test run: |- ./target/release/madara --dev --execution native & diff --git a/.github/workflows/starknet-rpc-tests.yml b/.github/workflows/starknet-rpc-tests.yml index c7bd2068a8..bd2c67161e 100644 --- a/.github/workflows/starknet-rpc-tests.yml +++ b/.github/workflows/starknet-rpc-tests.yml @@ -29,7 +29,7 @@ jobs: sudo apt-get install -y clang llvm libudev-dev protobuf-compiler - name: Setup dev chain run: | - ./target/release/madara setup --chain=dev --from-remote + ./target/release/madara setup --chain=dev --from-local=configs - name: Run rpc native test run: |- ./target/release/madara --dev --sealing=manual --execution=Native & diff --git a/.gitmodules b/.gitmodules index 90c06c2e15..32a1c93e3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,9 @@ [submodule "madara-infra"] path = madara-infra url = https://github.com/keep-starknet-strange/madara-infra -[submodule "madara-app"] - path = madara-app - url = https://github.com/keep-starknet-strange/madara-app [submodule "madara-docs"] path = madara-docs url = https://github.com/keep-starknet-strange/madara-docs -[submodule "madara-dev-explorer"] - path = madara-dev-explorer - url = https://github.com/keep-starknet-strange/madara-dev-explorer [submodule "madara-tsukuyomi"] path = madara-tsukuyomi url = https://github.com/keep-starknet-strange/madara-tsukuyomi diff --git a/crates/node/src/commands/setup.rs b/crates/node/src/commands/setup.rs index b1a925a80b..ff9b25e461 100644 --- a/crates/node/src/commands/setup.rs +++ b/crates/node/src/commands/setup.rs @@ -148,6 +148,7 @@ fn copy_file(src_path: &Path, dest_dir_path: &PathBuf) -> Result<()> { std::fs::create_dir_all(dest_dir_path)?; let dest_file_path = dest_dir_path.join(src_path.file_name().ok_or("File name not found")?); + println!("Copying '{}' to '{}'", src_path.display(), dest_file_path.display()); std::fs::copy(src_path, dest_file_path)?; Ok(()) diff --git a/madara-app b/madara-app deleted file mode 160000 index 8c73762180..0000000000 --- a/madara-app +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c73762180664bc0deac52eddd41a1812c09166b diff --git a/madara-dev-explorer b/madara-dev-explorer deleted file mode 160000 index 76da9025dd..0000000000 --- a/madara-dev-explorer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76da9025dd989dc727e51c75c685e89de4f46820 From acd4044c5848077a0c76fd2569fa20e1f59a33c7 Mon Sep 17 00:00:00 2001 From: 0xevolve Date: Wed, 8 Nov 2023 11:34:47 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e14cb4c7b4..8caa3f581e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ - dev(compilation): add incremental compilation - feat(rpc): add support for bulk estimate fee - feat: add argent multicall contract to genesis +- fix(ci): setup should fetch files from local config +- chore: deprecate `madara-app` and `madara-dev-explorer` modules ## v0.5.0