Remove |cargo install| duplication
This commit is contained in:
parent
080d18b06e
commit
088bab61a4
|
@ -43,9 +43,8 @@ echo --- Creating tarball
|
||||||
git rev-parse HEAD
|
git rev-parse HEAD
|
||||||
) > solana-release/version.txt
|
) > solana-release/version.txt
|
||||||
|
|
||||||
cargo install --path drone --root solana-release
|
scripts/cargo-install-all.sh --root solana-release
|
||||||
cargo install --path . --root solana-release
|
scripts/install-native-programs.sh solana-release/bin/deps/ release
|
||||||
./scripts/install-native-programs.sh solana-release/bin/deps/ release
|
|
||||||
|
|
||||||
./fetch-perf-libs.sh
|
./fetch-perf-libs.sh
|
||||||
# shellcheck source=/dev/null
|
# shellcheck source=/dev/null
|
||||||
|
|
|
@ -146,10 +146,9 @@ build() {
|
||||||
$MAYBE_DOCKER bash -c "
|
$MAYBE_DOCKER bash -c "
|
||||||
set -ex
|
set -ex
|
||||||
export NDEBUG=1
|
export NDEBUG=1
|
||||||
cargo install --path drone --features=$cargoFeatures --root farf
|
scripts/cargo-install-all.sh --features=$cargoFeatures --root farf
|
||||||
cargo install --path . --features=$cargoFeatures --root farf
|
|
||||||
mkdir -p farf/bin/deps/
|
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"
|
echo "Build took $SECONDS seconds"
|
||||||
|
|
|
@ -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 . "$@"
|
|
@ -20,8 +20,7 @@ fi
|
||||||
rm -rf usr/
|
rm -rf usr/
|
||||||
../../ci/docker-run.sh solanalabs/rust:1.31.0 bash -c "
|
../../ci/docker-run.sh solanalabs/rust:1.31.0 bash -c "
|
||||||
set -ex
|
set -ex
|
||||||
cargo install --path drone --root sdk/docker-solana/usr
|
scripts/cargo-install-all.sh --root sdk/docker-solana/usr
|
||||||
cargo install --path . --root sdk/docker-solana/usr
|
|
||||||
"
|
"
|
||||||
cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
|
cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
|
||||||
../../scripts/install-native-programs.sh usr/bin/deps/ release
|
../../scripts/install-native-programs.sh usr/bin/deps/ release
|
||||||
|
|
|
@ -91,8 +91,7 @@ parts:
|
||||||
- scripts
|
- scripts
|
||||||
override-build: |
|
override-build: |
|
||||||
# Build/install all programs
|
# Build/install all programs
|
||||||
cargo install --path drone --root $SNAPCRAFT_PART_INSTALL --bins
|
scripts/cargo-install-all.sh --root $SNAPCRAFT_PART_INSTALL --bins
|
||||||
cargo install --path . --root $SNAPCRAFT_PART_INSTALL --bins
|
|
||||||
|
|
||||||
# Install native programs
|
# Install native programs
|
||||||
mkdir -p $SNAPCRAFT_PART_INSTALL/bin/deps/
|
mkdir -p $SNAPCRAFT_PART_INSTALL/bin/deps/
|
||||||
|
|
Loading…
Reference in New Issue