Remove |cargo install| duplication

This commit is contained in:
Michael Vines 2018-12-11 22:50:42 -08:00 committed by Grimes
parent 080d18b06e
commit 088bab61a4
5 changed files with 16 additions and 10 deletions

View File

@ -43,9 +43,8 @@ echo --- Creating tarball
git rev-parse HEAD
) > solana-release/version.txt
cargo install --path drone --root solana-release
cargo install --path . --root solana-release
./scripts/install-native-programs.sh solana-release/bin/deps/ release
scripts/cargo-install-all.sh --root solana-release
scripts/install-native-programs.sh solana-release/bin/deps/ release
./fetch-perf-libs.sh
# shellcheck source=/dev/null

View File

@ -146,10 +146,9 @@ build() {
$MAYBE_DOCKER bash -c "
set -ex
export NDEBUG=1
cargo install --path drone --features=$cargoFeatures --root farf
cargo install --path . --features=$cargoFeatures --root farf
scripts/cargo-install-all.sh --features=$cargoFeatures --root farf
mkdir -p farf/bin/deps/
./scripts/install-native-programs.sh farf/bin/deps/ release
scripts/install-native-programs.sh farf/bin/deps/ release
"
)
echo "Build took $SECONDS seconds"

10
scripts/cargo-install-all.sh Executable file
View File

@ -0,0 +1,10 @@
#!/usr/bin/env bash
#
# |cargo install| of the top-level crate will not install binaries for
# other workspace creates.
set -e
cd "$(dirname "$0")/.."
set -x
cargo install --path drone "$@"
cargo install --path . "$@"

View File

@ -20,8 +20,7 @@ fi
rm -rf usr/
../../ci/docker-run.sh solanalabs/rust:1.31.0 bash -c "
set -ex
cargo install --path drone --root sdk/docker-solana/usr
cargo install --path . --root sdk/docker-solana/usr
scripts/cargo-install-all.sh --root sdk/docker-solana/usr
"
cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
../../scripts/install-native-programs.sh usr/bin/deps/ release

View File

@ -91,8 +91,7 @@ parts:
- scripts
override-build: |
# Build/install all programs
cargo install --path drone --root $SNAPCRAFT_PART_INSTALL --bins
cargo install --path . --root $SNAPCRAFT_PART_INSTALL --bins
scripts/cargo-install-all.sh --root $SNAPCRAFT_PART_INSTALL --bins
# Install native programs
mkdir -p $SNAPCRAFT_PART_INSTALL/bin/deps/