Skip to content

Commit

Permalink
hotfix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
julienbrs committed Dec 2, 2024
1 parent 520f055 commit 28503cb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion merkle_tree_rust/src/core/node.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 28503cb

Please sign in to comment.