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

Fix windows binary build on v1.0 (#8968)

Browse Source 
Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
Dan Albert
2020-03-19 15:58:34 -07:00
committed by GitHub
parent 495ab631d6
commit 61bd9e6a28
2 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ci/publish-tarball.sh
View File

@ -45,7 +45,7 @@ linux)
TARGET=x86_64-unknown-linux-gnu TARGET=x86_64-unknown-linux-gnu
;; ;;
windows) windows)
TARGET=x86_64-pc-windows-msvc TARGET=x86_64-pc-windows-gnu
;; ;;
*) *)
echo CI_OS_NAME unset echo CI_OS_NAME unset
@ -73,15 +73,6 @@ echo --- Creating release tarball
source ci/rust-version.sh stable source ci/rust-version.sh stable
scripts/cargo-install-all.sh +"$rust_stable" --use-move solana-release scripts/cargo-install-all.sh +"$rust_stable" --use-move solana-release
# Reduce the Windows archive size until
# https://github.com/appveyor/ci/issues/2997 is fixed
if [[ -n $APPVEYOR ]]; then
rm -f \
solana-release/bin/solana-validator.exe \
solana-release/bin/solana-bench-exchange.exe \
fi
tar cvf solana-release-$TARGET.tar solana-release tar cvf solana-release-$TARGET.tar solana-release
bzip2 solana-release-$TARGET.tar bzip2 solana-release-$TARGET.tar
cp solana-release/bin/solana-install-init solana-install-init-$TARGET cp solana-release/bin/solana-install-init solana-install-init-$TARGET

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

@ -55,43 +55,55 @@ cargo=cargo
echo "Install location: $installDir ($buildVariant)" echo "Install location: $installDir ($buildVariant)"
cd "$(dirname "$0")"/.. cd "$(dirname "$0")"/..
./fetch-perf-libs.sh
SECONDS=0 SECONDS=0
( if [[ $CI_OS_NAME = windows ]]; then
set -x # Limit windows to end-user command-line tools. Full validator support is not
# shellcheck disable=SC2086 # Don't want to double quote $rust_version # yet available on windows
$cargo $maybeRustVersion build $maybeReleaseFlag BINS=(
solana
if $useMove; then solana-install
moveLoaderDir=programs/move_loader solana-install-init
solana-keygen
)
else
./fetch-perf-libs.sh
(
set -x
# shellcheck disable=SC2086 # Don't want to double quote $rust_version # shellcheck disable=SC2086 # Don't want to double quote $rust_version
$cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml" $cargo $maybeRustVersion build $maybeReleaseFlag
cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
fi
)
BINS=( if $useMove; then
solana moveLoaderDir=programs/move_loader
solana-bench-exchange # shellcheck disable=SC2086 # Don't want to double quote $rust_version
solana-bench-tps $cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml"
solana-faucet cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
solana-gossip fi
solana-install )
solana-install-init
solana-keygen
solana-ledger-tool
solana-log-analyzer
solana-net-shaper
solana-sys-tuner
solana-validator
solana-watchtower
)
#XXX: Ensure `solana-genesis` is built LAST!
# See https://github.com/solana-labs/solana/issues/5826 BINS=(
BINS+=(solana-genesis) solana
solana-bench-exchange
solana-bench-tps
solana-faucet
solana-gossip
solana-install
solana-install-init
solana-keygen
solana-ledger-tool
solana-log-analyzer
solana-net-shaper
solana-sys-tuner
solana-validator
solana-watchtower
)
#XXX: Ensure `solana-genesis` is built LAST!
# See https://github.com/solana-labs/solana/issues/5826
BINS+=(solana-genesis)
fi
binArgs=() binArgs=()
for bin in "${BINS[@]}"; do for bin in "${BINS[@]}"; do