From d698f7621bf643408349fded90e00d8d9be2fe0a Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Fri, 18 Aug 2023 11:38:50 +0300 Subject: [PATCH] [Chore] Update rust toolchain version Problem: new recommended Rust version is 1.64.0 now for octez. Solution: Update it. --- Formula/tezos-accuser-Proxford.rb | 2 +- Formula/tezos-accuser-PtNairob.rb | 2 +- Formula/tezos-admin-client.rb | 2 +- Formula/tezos-baker-Proxford.rb | 2 +- Formula/tezos-baker-PtNairob.rb | 2 +- Formula/tezos-client.rb | 2 +- Formula/tezos-codec.rb | 2 +- Formula/tezos-node.rb | 2 +- Formula/tezos-signer.rb | 2 +- Formula/tezos-smart-rollup-client-Proxford.rb | 2 +- Formula/tezos-smart-rollup-client-PtNairob.rb | 2 +- Formula/tezos-smart-rollup-node-Proxford.rb | 2 +- Formula/tezos-smart-rollup-node-PtNairob.rb | 2 +- docker/build/build-rust.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb index a90d5fd88..c99094736 100644 --- a/Formula/tezos-accuser-Proxford.rb +++ b/Formula/tezos-accuser-Proxford.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-accuser-PtNairob.rb b/Formula/tezos-accuser-PtNairob.rb index 3a2579b82..7d35e6935 100644 --- a/Formula/tezos-accuser-PtNairob.rb +++ b/Formula/tezos-accuser-PtNairob.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index efb3e73c4..45c663b63 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb index 969482cc4..5c4d4ef88 100644 --- a/Formula/tezos-baker-Proxford.rb +++ b/Formula/tezos-baker-Proxford.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-baker-PtNairob.rb b/Formula/tezos-baker-PtNairob.rb index ababf8636..892fec0cb 100644 --- a/Formula/tezos-baker-PtNairob.rb +++ b/Formula/tezos-baker-PtNairob.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 5eaaa98d4..a677a1840 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index c93330910..0bae64cea 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 04c801562..fbea106a5 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index 9307c939a..aefc2c0fb 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-client-Proxford.rb b/Formula/tezos-smart-rollup-client-Proxford.rb index 5c19fc17d..4949ffcc8 100644 --- a/Formula/tezos-smart-rollup-client-Proxford.rb +++ b/Formula/tezos-smart-rollup-client-Proxford.rb @@ -40,7 +40,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-client-PtNairob.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb index a0056b5e4..844fe75f8 100644 --- a/Formula/tezos-smart-rollup-client-PtNairob.rb +++ b/Formula/tezos-smart-rollup-client-PtNairob.rb @@ -40,7 +40,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-node-Proxford.rb b/Formula/tezos-smart-rollup-node-Proxford.rb index e40048eeb..11f73a268 100644 --- a/Formula/tezos-smart-rollup-node-Proxford.rb +++ b/Formula/tezos-smart-rollup-node-Proxford.rb @@ -41,7 +41,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-node-PtNairob.rb b/Formula/tezos-smart-rollup-node-PtNairob.rb index aa1817de3..359d368d0 100644 --- a/Formula/tezos-smart-rollup-node-PtNairob.rb +++ b/Formula/tezos-smart-rollup-node-PtNairob.rb @@ -41,7 +41,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/docker/build/build-rust.sh b/docker/build/build-rust.sh index 5e44cf251..6419060e1 100755 --- a/docker/build/build-rust.sh +++ b/docker/build/build-rust.sh @@ -7,4 +7,4 @@ set -euo pipefail wget https://sh.rustup.rs/rustup-init.sh chmod +x rustup-init.sh -./rustup-init.sh --profile minimal --default-toolchain 1.60.0 -y +./rustup-init.sh --profile minimal --default-toolchain 1.64.0 -y