Merge pull request #3966 from iron-fish/staging

STAGING -> MASTER
iron-fish · Jun 14, 2023 · b887f51 · b887f51
2 parents ccc100a + 1a0a7e6
commit b887f51
Show file tree

Hide file tree

Showing 85 changed files with 3,761 additions and 2,901 deletions.
diff --git a/.github/workflows/rust_ci.yml b/.github/workflows/rust_ci.yml
@@ -81,7 +81,7 @@ jobs:
           wget -O tarpaulin.tar.gz https://github.com/xd009642/tarpaulin/releases/download/0.22.0/cargo-tarpaulin-0.22.0-travis.tar.gz
           tar -xzf tarpaulin.tar.gz
           mv cargo-tarpaulin ~/.cargo/bin/
-          cargo tarpaulin -p ironfish_rust --release --out Xml --avoid-cfg-tarpaulin --skip-clean --timeout 180 -- --test-threads 1
+          cargo tarpaulin -p ironfish --release --out Xml --avoid-cfg-tarpaulin --skip-clean --timeout 180 -- --test-threads 1
 
       # Upload code coverage to Codecov
       - name: Upload to codecov.io

diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,7 @@ lerna-debug.log*
 .pnp.*
 
 # rust build artifacts
-**/target/*
+**/target
 *.node
 
 # ironfish-cli