diff --git a/.travis/install-program-deps.sh b/.travis/install-program-deps.sh index f57a1567..06ebdb56 100755 --- a/.travis/install-program-deps.sh +++ b/.travis/install-program-deps.sh @@ -22,6 +22,7 @@ node --version if [[ -n $SOLANA_VERSION ]]; then sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)" fi -export PATH="~/.local/share/solana/install/active_release/bin:$PATH" +export PATH=/home/travis/.local/share/solana/install/active_release/bin:"$PATH" + solana --version cargo build-bpf --version diff --git a/Cargo.lock b/Cargo.lock index 1769296a..e6f1dcb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -626,13 +626,12 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "2.1.0" -source = "git+https://github.com/garious/curve25519-dalek?rev=60efef3553d6bf3d7f3b09b5f97acd54d72529ff#60efef3553d6bf3d7f3b09b5f97acd54d72529ff" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" dependencies = [ - "borsh", "byteorder", "digest 0.8.1", "rand_core", - "serde", "subtle 2.2.3", "zeroize", ] @@ -640,12 +639,13 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" +source = "git+https://github.com/garious/curve25519-dalek?rev=60efef3553d6bf3d7f3b09b5f97acd54d72529ff#60efef3553d6bf3d7f3b09b5f97acd54d72529ff" dependencies = [ + "borsh", "byteorder", "digest 0.8.1", "rand_core", + "serde", "subtle 2.2.3", "zeroize", ] diff --git a/ci/script.sh b/ci/script.sh index da8602fd..2d4114e9 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -47,7 +47,6 @@ _ cargo run --manifest-path=utils/test-client/Cargo.toml # _ git diff --exit-code token-swap/program/inc/token-swap.h # _ cc token-swap/program/inc/token-swap.h -o target/token-swap.gch - # For all BPF programs for Xargo_toml in $(git ls-files -- '*/Xargo.toml'); do program_dir=$(dirname "$Xargo_toml")