From 28503cb8a558a9f61486ecbe0fa2fb67a7fe749a Mon Sep 17 00:00:00 2001 From: julienbrs Date: Mon, 2 Dec 2024 19:41:07 +0100 Subject: [PATCH] hotfix ci --- .github/workflows/ci.yml | 20 ++++++++++++-------- README.md | 4 ++-- merkle_tree_rust/src/core/node.rs | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b96b81..a1a1344 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,21 +27,21 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-cargo-${{ hashFiles('merkle_tree_rust/Cargo.lock') }} - name: Check formatting - run: cargo fmt -- --check + run: cargo fmt --manifest-path merkle_tree_rust/Cargo.toml -- --check - name: Lint with clippy - run: cargo clippy -- -D warnings + run: cargo clippy --manifest-path merkle_tree_rust/Cargo.toml -- -D warnings - name: Run tests - run: cargo test --verbose + run: cargo test --manifest-path merkle_tree_rust/Cargo.toml --verbose - name: Generate coverage run: | cargo install cargo-tarpaulin - cargo tarpaulin --out Xml + cargo tarpaulin --manifest-path merkle_tree_rust/Cargo.toml --out Xml - name: Upload coverage uses: codecov/codecov-action@v3 @@ -59,10 +59,14 @@ jobs: uses: actions/cache@v3 with: path: ~/.scarb - key: ${{ runner.os }}-scarb-${{ hashFiles('**/Scarb.toml') }} + key: ${{ runner.os }}-scarb-${{ hashFiles('merkle_tree_cairo/Scarb.toml') }} - name: Run tests - run: scarb test + run: | + cd merkle_tree_cairo + scarb test - name: Run linter - run: scarb fmt --check + run: | + cd merkle_tree_cairo + scarb fmt --check \ No newline at end of file diff --git a/README.md b/README.md index c3f920e..d2c43eb 100644 --- a/README.md +++ b/README.md @@ -102,5 +102,5 @@ Contributions are welcome! Please read [CONTRIBUTING.md ](CONTRIBUTING.md)for gu Merkle Tree Builder follows best security practices but is provided as-is without any warranty. This project is licensed under the Apache License 2.0. -[![CI/CD](https://github.com/{owner}/{repo}/actions/workflows/ci.yml/badge.svg)](https://github.com/{owner}/{repo}/actions) -[![codecov](https://codecov.io/gh/{owner}/{repo}/branch/main/graph/badge.svg)](https://codecov.io/gh/{owner}/{repo}) +[![CI/CD](https://github.com/carbonable-labs/merkle-tree-builder/actions/workflows/ci.yml/badge.svg)](https://github.com/carbonable-labs/merkle-tree-builder/actions) +[![codecov](https://codecov.io/gh/carbonable-labs/merkle-tree-builder/branch/main/graph/badge.svg)](https://codecov.io/gh/carbonable-labs/merkle-tree-builder) diff --git a/merkle_tree_rust/src/core/node.rs b/merkle_tree_rust/src/core/node.rs index 61c0a20..60c80da 100644 --- a/merkle_tree_rust/src/core/node.rs +++ b/merkle_tree_rust/src/core/node.rs @@ -1,4 +1,4 @@ -use crate::core::allocation::{u64_to_felt, Allocation}; +use crate::core::allocation::{Allocation}; use starknet::core::types::Felt; use starknet_crypto::pedersen_hash; use std::collections::HashSet;