From 129b8f423f947ba1da91157af2d3836dad9a8ee6 Mon Sep 17 00:00:00 2001
From: Savely Krendelhoff <alicecandyom@proton.me>
Date: Sat, 30 Nov 2024 11:58:04 +0700
Subject: [PATCH] [TMP]

---
 .github/workflows/build-bottles.yml         | 4 ++--
 Formula/tezos-client.rb                     | 6 +++---
 Formula/tezos-node.rb                       | 8 +++++---
 Formula/tezos-smart-rollup-wasm-debugger.rb | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml
index f81403ca..66bd7910 100644
--- a/.github/workflows/build-bottles.yml
+++ b/.github/workflows/build-bottles.yml
@@ -15,9 +15,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ { id: macos-13, name: "ventura" } ]
+        os: [ { id: macos-14, name: "sonoma" } ]
         # we don't bottle meta-formulas that contain only services
-        formula: [tezos-smart-rollup-wasm-debugger]
+        formula: [tezos-client]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb
index 9d06f3b5..1b0b6acc 100644
--- a/Formula/tezos-client.rb
+++ b/Formula/tezos-client.rb
@@ -13,7 +13,7 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
@@ -39,7 +39,7 @@ def make_deps
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.78.0", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
     system ["source .cargo/env",  "make build-deps"].join(" && ")
   end
@@ -47,7 +47,7 @@ def make_deps
   def install_template(dune_path, exec_path, name)
     bin.mkpath
     self.class.all_bins << name
-    system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ")
+    system ["source .cargo/env", "eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ")
     bin.install name
     ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}"
   end
diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb
index bf63cae9..c973e0fe 100644
--- a/Formula/tezos-node.rb
+++ b/Formula/tezos-node.rb
@@ -13,7 +13,7 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync rustup wget cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
@@ -39,9 +39,11 @@ def make_deps
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.78.0", "-y"
+    system "sed -i \"s/cargo build/cargo build --quiet/\" src/rust_deps/build.sh"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "rustup install 1.78.0"
+    system "make build-deps"
+    system "opam exec -- dune build -p octez-rust-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb
index c0ca49ca..454e9f96 100644
--- a/Formula/tezos-smart-rollup-wasm-debugger.rb
+++ b/Formula/tezos-smart-rollup-wasm-debugger.rb
@@ -48,7 +48,7 @@ def make_deps
   def install_template(dune_path, exec_path, name)
     bin.mkpath
     self.class.all_bins << name
-    system ["source .cargo/env", "eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ")
+    system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ")
     bin.install name
     ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}"
   end