Fix windows binary build on v1.0 (#8968)
Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
@ -45,7 +45,7 @@ linux)
|
||||
TARGET=x86_64-unknown-linux-gnu
|
||||
;;
|
||||
windows)
|
||||
TARGET=x86_64-pc-windows-msvc
|
||||
TARGET=x86_64-pc-windows-gnu
|
||||
;;
|
||||
*)
|
||||
echo CI_OS_NAME unset
|
||||
@ -73,15 +73,6 @@ echo --- Creating release tarball
|
||||
source ci/rust-version.sh stable
|
||||
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
|
||||
bzip2 solana-release-$TARGET.tar
|
||||
cp solana-release/bin/solana-install-init solana-install-init-$TARGET
|
||||
|
@ -55,11 +55,21 @@ cargo=cargo
|
||||
echo "Install location: $installDir ($buildVariant)"
|
||||
|
||||
cd "$(dirname "$0")"/..
|
||||
./fetch-perf-libs.sh
|
||||
|
||||
SECONDS=0
|
||||
|
||||
(
|
||||
if [[ $CI_OS_NAME = windows ]]; then
|
||||
# Limit windows to end-user command-line tools. Full validator support is not
|
||||
# yet available on windows
|
||||
BINS=(
|
||||
solana
|
||||
solana-install
|
||||
solana-install-init
|
||||
solana-keygen
|
||||
)
|
||||
else
|
||||
./fetch-perf-libs.sh
|
||||
(
|
||||
set -x
|
||||
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
|
||||
$cargo $maybeRustVersion build $maybeReleaseFlag
|
||||
@ -70,9 +80,10 @@ SECONDS=0
|
||||
$cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml"
|
||||
cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
|
||||
fi
|
||||
)
|
||||
)
|
||||
|
||||
BINS=(
|
||||
|
||||
BINS=(
|
||||
solana
|
||||
solana-bench-exchange
|
||||
solana-bench-tps
|
||||
@ -87,11 +98,12 @@ BINS=(
|
||||
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)
|
||||
#XXX: Ensure `solana-genesis` is built LAST!
|
||||
# See https://github.com/solana-labs/solana/issues/5826
|
||||
BINS+=(solana-genesis)
|
||||
fi
|
||||
|
||||
binArgs=()
|
||||
for bin in "${BINS[@]}"; do
|
||||
|
Reference in New Issue
Block a user