Merge pull request #1141 from zcash/ci-fix-flags
CI: Fix passing feature flags into preparation action step
This commit is contained in:
commit
0fa76ff726
|
@ -27,13 +27,14 @@ jobs:
|
|||
extra_flags: zfuture
|
||||
env:
|
||||
RUSTFLAGS: ${{ matrix.rustflags }}
|
||||
RUSTDOCFLAGS: ${{ matrix.rustflags }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- id: prepare
|
||||
uses: ./.github/actions/prepare
|
||||
with:
|
||||
extra_flags: ${{ matrix.extra_flags != 'NOT_A_PUZZLE' && matrix.extra_flags || '' }}
|
||||
extra-features: ${{ matrix.extra_flags != 'NOT_A_PUZZLE' && matrix.extra_flags || '' }}
|
||||
- name: Run tests
|
||||
run: >
|
||||
cargo test
|
||||
|
|
|
@ -26,7 +26,7 @@ use crate::{
|
|||
ShieldedProtocol,
|
||||
};
|
||||
|
||||
#[cfg(any(feature = "transparent-inputs", feature = "orchard"))]
|
||||
#[cfg(any(feature = "transparent-inputs"))]
|
||||
use std::convert::Infallible;
|
||||
|
||||
#[cfg(feature = "transparent-inputs")]
|
||||
|
|
|
@ -285,7 +285,8 @@ mod tests {
|
|||
fn ua_round_trip() {
|
||||
#[cfg(feature = "orchard")]
|
||||
let orchard = {
|
||||
let sk = orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, 0).unwrap();
|
||||
let sk =
|
||||
orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
|
||||
let fvk = orchard::keys::FullViewingKey::from(&sk);
|
||||
Some(fvk.address_at(0u32, orchard::keys::Scope::External))
|
||||
};
|
||||
|
|
|
@ -811,7 +811,8 @@ mod tests {
|
|||
|
||||
#[cfg(feature = "orchard")]
|
||||
let orchard = {
|
||||
let sk = orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, 0).unwrap();
|
||||
let sk =
|
||||
orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
|
||||
Some(orchard::keys::FullViewingKey::from(&sk))
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue