From 1d8fca848e706ed3bd7901e6fc234f405ffca981 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 20:40:41 +0000 Subject: [PATCH 1/2] Point to upstream schemer repository We can do this now that https://github.com/aschampion/schemer/pull/15 has been merged. --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d4e2baa8b..27bfe2d13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,5 +23,5 @@ zcash_encoding = { path = "components/zcash_encoding" } zcash_note_encryption = { path = "components/zcash_note_encryption" } orchard = { git = "https://github.com/zcash/orchard.git", rev = "33f1c1141e50adb68715f3359bd75378b4756cca" } group = { git = "https://github.com/zkcrypto/group.git", rev = "f61e3e420ed1220c8f1f80988f8c6c5e202d8715" } -schemer = { git = "https://github.com/nuttycom/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } -schemer-rusqlite = { git = "https://github.com/nuttycom/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } +schemer = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } +schemer-rusqlite = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } From f27d3bca7f0cff7a5772cab677553b0d3db7a4e4 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 20:42:52 +0000 Subject: [PATCH 2/2] CI: Switch back to published cargo-tarpaulin releases The llvm-profparser branch has been merged and deleted. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34f3053d5..c4135037a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,7 +141,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: install - args: --git https://github.com/xd009642/tarpaulin.git --branch feat/llvm-profparser-integration cargo-tarpaulin + args: cargo-tarpaulin - name: Fetch path to Zcash parameters working-directory: ./zcash_proofs