From e505a9b209f69b77a5e4152875242ceaf143ad71 Mon Sep 17 00:00:00 2001 From: Jack May Date: Fri, 22 Jan 2021 17:08:06 -0800 Subject: [PATCH] Revert disabling script (#14788) --- scripts/build-downstream-projects.sh | 16 ++++++++-------- sdk/src/feature_set.rs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/build-downstream-projects.sh b/scripts/build-downstream-projects.sh index 2a2188bb6..eab301858 100755 --- a/scripts/build-downstream-projects.sh +++ b/scripts/build-downstream-projects.sh @@ -58,11 +58,11 @@ example_helloworld() { spl() { ( set -x - # rm -rf spl - # git clone https://github.com/solana-labs/solana-program-library.git spl + rm -rf spl + git clone https://github.com/solana-labs/solana-program-library.git spl cd spl - # ./patch.crates-io.sh "$solana_dir" + ./patch.crates-io.sh "$solana_dir" $cargo build @@ -71,9 +71,9 @@ spl() { #$cargo test #$cargo_test_bpf - # $cargo_test_bpf --manifest-path token/program/Cargo.toml - # $cargo_test_bpf --manifest-path associated-token-account/program/Cargo.toml - $cargo_test_bpf --manifest-path feature-proposal/program/Cargo.toml -- --nocapture + $cargo_test_bpf --manifest-path token/program/Cargo.toml + $cargo_test_bpf --manifest-path associated-token-account/program/Cargo.toml + $cargo_test_bpf --manifest-path feature-proposal/program/Cargo.toml ) } @@ -102,6 +102,6 @@ serum_dex() { } -# _ example_helloworld +_ example_helloworld _ spl -# _ serum_dex +_ serum_dex diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs index e2715c213..be59ee77d 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs @@ -210,7 +210,7 @@ lazy_static! { (prevent_upgrade_and_invoke::id(), "prevent upgrade and invoke in same tx batch"), (full_inflation::candidate_example::vote::id(), "community vote allowing candidate_example to enable full inflation"), (full_inflation::candidate_example::enable::id(), "full inflation enabled by candidate_example"), - (track_writable_deescalation::id(), "Track account writable deescalation"), + (track_writable_deescalation::id(), "track account writable deescalation"), /*************** ADD NEW FEATURES HERE ***************/ ] .iter()