From 130dc1c71c5cff11d4741c2fb493a318c97d3b06 Mon Sep 17 00:00:00 2001 From: Jack May Date: Wed, 25 Mar 2020 10:16:33 -0700 Subject: [PATCH 01/12] nudge --- sdk/bpf/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 04ae44ac106dec..30ab749a46db12 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -25,7 +25,7 @@ download() { # Install or upgrade xargo ( cargo install cargo-update - cargo install-update-config --version =0.3.19 xargo + # cargo install-update-config --version =0.3.19 xargo set -e cargo install-update -i xargo xargo --version > xargo.md 2>&1 From eb25bc6840537aa46d435259db41cd84a46c6b90 Mon Sep 17 00:00:00 2001 From: Jack May Date: Wed, 25 Mar 2020 12:17:50 -0700 Subject: [PATCH 02/12] nudge --- sdk/bpf/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 30ab749a46db12..43b5ca1a02e213 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -25,7 +25,7 @@ download() { # Install or upgrade xargo ( cargo install cargo-update - # cargo install-update-config --version =0.3.19 xargo + cargo install-update-config -a xargo set -e cargo install-update -i xargo xargo --version > xargo.md 2>&1 From 2e38b2fee1e3c7fff4309d974a1f1f96c3083035 Mon Sep 17 00:00:00 2001 From: Jack May Date: Wed, 25 Mar 2020 12:42:34 -0700 Subject: [PATCH 03/12] nudge --- sdk/bpf/scripts/install.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 43b5ca1a02e213..b0a424b937d613 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -24,10 +24,11 @@ download() { # Install or upgrade xargo ( - cargo install cargo-update - cargo install-update-config -a xargo - set -e - cargo install-update -i xargo + # cargo install cargo-update + # cargo install-update-config -a xargo + # set -e + # cargo install-update -i xargo + cargo install -f xargo xargo --version > xargo.md 2>&1 ) # shellcheck disable=SC2181 From 11ad5faaaf53e6785a18630380e5be3c7d786c37 Mon Sep 17 00:00:00 2001 From: Jack May Date: Wed, 25 Mar 2020 13:36:21 -0700 Subject: [PATCH 04/12] nudge --- sdk/bpf/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index b0a424b937d613..47959436dda742 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -26,7 +26,7 @@ download() { ( # cargo install cargo-update # cargo install-update-config -a xargo - # set -e + set -e # cargo install-update -i xargo cargo install -f xargo xargo --version > xargo.md 2>&1 From 4b0510626458df84e489e14921db85e1e2440130 Mon Sep 17 00:00:00 2001 From: Jack May Date: Wed, 25 Mar 2020 17:16:58 -0700 Subject: [PATCH 05/12] nudge --- sdk/bpf/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 47959436dda742..aa4f3a580dd2e5 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -26,7 +26,7 @@ download() { ( # cargo install cargo-update # cargo install-update-config -a xargo - set -e + set -ex # cargo install-update -i xargo cargo install -f xargo xargo --version > xargo.md 2>&1 From 3a77e010672c04c482daa59bb1d74ca8870723e1 Mon Sep 17 00:00:00 2001 From: Jack May Date: Wed, 25 Mar 2020 20:06:13 -0700 Subject: [PATCH 06/12] nudge --- sdk/bpf/scripts/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index aa4f3a580dd2e5..3f6f398508a182 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -26,8 +26,9 @@ download() { ( # cargo install cargo-update # cargo install-update-config -a xargo - set -ex + set -x # cargo install-update -i xargo + cargo --version cargo install -f xargo xargo --version > xargo.md 2>&1 ) From 75fad6c653d07308e7e27097d88dab19f991dbc8 Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 26 Mar 2020 08:22:52 -0700 Subject: [PATCH 07/12] nudge --- sdk/bpf/scripts/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 3f6f398508a182..c08df0e60eba72 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -28,7 +28,9 @@ download() { # cargo install-update-config -a xargo set -x # cargo install-update -i xargo + env cargo --version + rustup toolchain list cargo install -f xargo xargo --version > xargo.md 2>&1 ) From f926ee1e73600760d9797062f084a0ae52f2ac3e Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 26 Mar 2020 08:38:16 -0700 Subject: [PATCH 08/12] nudge --- ci/rust-version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/rust-version.sh b/ci/rust-version.sh index f338a340a64ccc..f7a54026a3ce2f 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -38,6 +38,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version" declare toolchain=$1 if ! cargo +"$toolchain" -V; then rustup install "$toolchain" + rustup default "$toolchain" cargo +"$toolchain" -V fi } From 0246bb069cc8eafc882b4fdc70d0517d60cc6296 Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 26 Mar 2020 09:18:13 -0700 Subject: [PATCH 09/12] nudge --- sdk/bpf/scripts/install.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index c08df0e60eba72..b8fd2d625b1c9f 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -22,16 +22,10 @@ download() { wget "${args[@]}" } -# Install or upgrade xargo +# Install xargo ( - # cargo install cargo-update - # cargo install-update-config -a xargo - set -x - # cargo install-update -i xargo - env - cargo --version - rustup toolchain list - cargo install -f xargo + set -ex + cargo +"$rust_stable" install xargo xargo --version > xargo.md 2>&1 ) # shellcheck disable=SC2181 From ad04b7b3a777d2642c073de94628a0937f5634b7 Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 26 Mar 2020 09:25:49 -0700 Subject: [PATCH 10/12] nudge --- sdk/bpf/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index b8fd2d625b1c9f..67ec3f33f53be6 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -25,7 +25,7 @@ download() { # Install xargo ( set -ex - cargo +"$rust_stable" install xargo + cargo +"${rust_stable:-}" install xargo xargo --version > xargo.md 2>&1 ) # shellcheck disable=SC2181 From a699db9c0c33c790c4741d7453998b0acb7921a6 Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 26 Mar 2020 09:55:45 -0700 Subject: [PATCH 11/12] nudge --- sdk/bpf/scripts/install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 67ec3f33f53be6..c0527e4f017ef8 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -25,7 +25,11 @@ download() { # Install xargo ( set -ex - cargo +"${rust_stable:-}" install xargo + if [[ -n $rust_stable ]]; then + cargo +"$rust_stable" install xargo + else + cargo install xargo + fi xargo --version > xargo.md 2>&1 ) # shellcheck disable=SC2181 From 31a1497be6b41416e3b72dbfba21d51dcc9af474 Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 26 Mar 2020 09:58:37 -0700 Subject: [PATCH 12/12] nudge --- sdk/bpf/scripts/install.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index c0527e4f017ef8..67ec3f33f53be6 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -25,11 +25,7 @@ download() { # Install xargo ( set -ex - if [[ -n $rust_stable ]]; then - cargo +"$rust_stable" install xargo - else - cargo install xargo - fi + cargo +"${rust_stable:-}" install xargo xargo --version > xargo.md 2>&1 ) # shellcheck disable=SC2181