From 329382f01630136b563c0c59e72bb43de2feb5f4 Mon Sep 17 00:00:00 2001 From: Jack May Date: Mon, 25 Feb 2019 15:35:45 -0800 Subject: [PATCH] Pull BPF enabled rustc and sysroot into SDK (#2936) --- ci/test-stable.sh | 4 ++- sdk/bpf/.gitignore | 2 ++ sdk/bpf/scripts/install.sh | 50 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/ci/test-stable.sh b/ci/test-stable.sh index 7ad16db3ae..2de86e65e9 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -36,9 +36,11 @@ test-stable-perf) Cargo.toml$ \ ci/test-stable-perf.sh \ ci/test-stable.sh \ + ^programs/ \ + ^sdk/ \ || { annotate --style info \ - "Skipped tests as no relavant files were modified" + "Skipped test-stable-perf as no relavant files were modified" exit 0 } diff --git a/sdk/bpf/.gitignore b/sdk/bpf/.gitignore index faa91ca332..7e126fa0d9 100644 --- a/sdk/bpf/.gitignore +++ b/sdk/bpf/.gitignore @@ -1,2 +1,4 @@ /criterion* /llvm-native* +/rust-sysroot* +/rust-toolchain* diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 529af95e11..0c4ddd939d 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -54,4 +54,54 @@ if [[ ! -f llvm-native-$machine-$version.md ]]; then fi fi +# Install Rust-BPF +version=v0.0.1 +if [[ ! -f rust-bpf-$machine-$version.md ]]; then + ( + filename=solana-rust-bpf-$machine.tar.bz2 + + set -ex + rm -rf rust-bpf* + mkdir -p rust-bpf + cd rust-bpf + wget --progress=dot:giga https://github.com/solana-labs/rust-bpf-builder/releases/download/$version/$filename + tar -jxf $filename + rm -rf $filename + + echo "https://github.com/solana-labs/rust-bpf-builder/releases/tag/$version" > ../rust-bpf-$machine-$version.md + ) + exitcode=$? + if [[ $exitcode -ne 0 ]]; then + rm -rf rust-bpf + exit 1 + fi + set +e + rustup toolchain uninstall bpf + set -e + rustup toolchain link bpf rust-bpf +fi + +# Install Rust-BPF Sysroot +version=v0.0.1 +if [[ ! -f rust-bpf-sysroot-$version.md ]]; then + ( + filename=solana-rust-bpf-sysroot.tar.bz2 + + set -ex + rm -rf rust-bpf-sysroot* + mkdir -p rust-bpf-sysroot + cd rust-bpf-sysroot + wget --progress=dot:giga https://github.com/solana-labs/rust-bpf-sysroot/releases/download/$version/$filename + tar -jxf $filename + rm -rf $filename + + echo "https://github.com/solana-labs/rust-bpf-sysroot/releases/tag/$version" > ../rust-bpf-sysroot-$version.md + ) + exitcode=$? + if [[ $exitcode -ne 0 ]]; then + rm -rf rust-bpf-sysroot + exit 1 + fi +fi + exit 0