gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CI: Use branch-versioned cargo throughout

Browse Source
This commit is contained in:
Trent Nelson
2020-10-12 21:19:41 -06:00
committed by mergify[bot]
parent dd54ea78ac
commit 66c3c6c2b3
10 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/cargo-install-all.sh
View File

@@ -2,6 +2,9 @@
#
# |cargo install| of the top-level crate will not install binaries for
# other workspace crates or native program crates.
here="$(dirname "$0")"
cargo="$(readlink -f "${here}../cargo")"
set -e
usage() {
@@ -46,7 +49,6 @@ fi
installDir="$(mkdir -p "$installDir"; cd "$installDir"; pwd)"
mkdir -p "$installDir/bin/deps"
cargo=cargo
echo "Install location: $installDir ($buildVariant)"
@@ -112,9 +114,9 @@ mkdir -p "$installDir/bin"
(
set -x
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
$cargo $maybeRustVersion build $maybeReleaseFlag "${binArgs[@]}"
"$cargo" $maybeRustVersion build $maybeReleaseFlag "${binArgs[@]}"
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
$cargo $maybeRustVersion install spl-token-cli --root "$installDir"
"$cargo" $maybeRustVersion install spl-token-cli --root "$installDir"
)
for bin in "${BINS[@]}"; do