From 83ec28bcbd92d045b49771fde84127236dd3ac02 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 6 Dec 2023 12:08:00 +0000 Subject: [PATCH 1/7] [Chore] Bump Tezos sources to v19.0-rc1 --- flake.lock | 12 ++++++------ meta.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index a114eb309..744355aa9 100644 --- a/flake.lock +++ b/flake.lock @@ -1212,11 +1212,11 @@ "opam-repository_2": { "flake": false, "locked": { - "lastModified": 1690375350, - "narHash": "sha256-blbuXgC68vvccQGs2LQv6TBITXbYOobWf/d4CU3rrnc=", + "lastModified": 1700575971, + "narHash": "sha256-gnP94vSr3hn0BMl1ZydwFw6yMMATPiTv3EsEcTNzMy4=", "owner": "tezos", "repo": "opam-repository", - "rev": "14e619168449e86a5a8ff4029ab57174464e18bd", + "rev": "f84b4412bf92f81fa4d554aed624fa0a6a72ec96", "type": "gitlab" }, "original": { @@ -1365,11 +1365,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1700492983, - "narHash": "sha256-9owciDpeM9ZFFfVbEsfgpOY9PXtDZlj48tt0tYAJzPg=", + "lastModified": 1701727072, + "narHash": "sha256-Q8xJY2AlZBIoEexL6PZ6HvRt5UDaVGlte1CMkQWg83s=", "owner": "tezos", "repo": "tezos", - "rev": "6b31a6d28d9d17952548253ec0f1b3782efb048d", + "rev": "7769d51b1b846c281c8bd9d2f26d46c92954cefd", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index 103e8fffe..fd8ee20a4 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "2", "maintainer": "Serokell ", - "tezos_ref": "v18.1" + "tezos_ref": "v19.0-rc1" } From 542cf9769126b1f11308e9da14c07235bc017520 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 6 Dec 2023 12:08:01 +0000 Subject: [PATCH 2/7] [Chore] Update brew formulae for v19.0-rc1 --- Formula/tezos-accuser-Proxford.rb | 7 ++----- Formula/tezos-accuser-PtNairob.rb | 7 ++----- Formula/tezos-admin-client.rb | 7 ++----- Formula/tezos-baker-Proxford.rb | 7 ++----- Formula/tezos-baker-PtNairob.rb | 7 ++----- Formula/tezos-client.rb | 7 ++----- Formula/tezos-codec.rb | 7 ++----- Formula/tezos-dac-client.rb | 7 ++----- Formula/tezos-dac-node.rb | 7 ++----- Formula/tezos-node-ghostnet.rb | 2 +- Formula/tezos-node-mainnet.rb | 2 +- Formula/tezos-node-nairobinet.rb | 2 +- Formula/tezos-node.rb | 7 ++----- Formula/tezos-signer-http.rb | 2 +- Formula/tezos-signer-https.rb | 2 +- Formula/tezos-signer-tcp.rb | 2 +- Formula/tezos-signer-unix.rb | 2 +- Formula/tezos-signer.rb | 7 ++----- Formula/tezos-smart-rollup-client-Proxford.rb | 7 ++----- Formula/tezos-smart-rollup-client-PtNairob.rb | 7 ++----- Formula/tezos-smart-rollup-node.rb | 7 ++----- Formula/tezos-smart-rollup-wasm-debugger.rb | 7 ++----- 22 files changed, 37 insertions(+), 82 deletions(-) diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb index 0f27e912d..8db3b8923 100644 --- a/Formula/tezos-accuser-Proxford.rb +++ b/Formula/tezos-accuser-Proxford.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserProxford.version}/" - sha256 cellar: :any, big_sur: "6960ca66d64eac9c3ff1ff2e1a6735dd5dc77e8907258e529e44bcbd2d58c66e" - sha256 cellar: :any, arm64_big_sur: "4d5a9ee11f944d4f247b6f95996d92a576982c58ad8a287ba8d8768c55910a99" - sha256 cellar: :any, monterey: "00f63f452ca6798a5432b4e5bd4fb3544f2052f94e494ac101879f856a75e999" end def make_deps diff --git a/Formula/tezos-accuser-PtNairob.rb b/Formula/tezos-accuser-PtNairob.rb index a9c814a2b..a27f9368c 100644 --- a/Formula/tezos-accuser-PtNairob.rb +++ b/Formula/tezos-accuser-PtNairob.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtnairob.version}/" - sha256 cellar: :any, big_sur: "ae7ea0f0f5c1295cecf4815d7a0b8a3a4d323c2d5a5cbd2ddb1eb6a804171dba" - sha256 cellar: :any, arm64_big_sur: "47805132e7c3b23040e64ddba7131da946b49d817ebd9cdad5cd2423417df5c5" - sha256 cellar: :any, monterey: "7d701398e3ddb70b03cdac4172db6f5cbc87b51cc288fa1b79800c317b1b6347" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index 617d6d52e..91616fd63 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" - sha256 cellar: :any, big_sur: "b499b9327493ad54e50c204579a098f9886812f3bfdbef3e302a611f829bbc94" - sha256 cellar: :any, arm64_big_sur: "096727e1b84eac57efc2f2cd376e6a9fde8f2946950f59e710e6e12fa9bfe8da" - sha256 cellar: :any, monterey: "564f59643a7372a23d8570bd0ca75515276208775e8f4052343119c402d3c0ac" end def make_deps diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb index a96b7c384..e6a87b3cc 100644 --- a/Formula/tezos-baker-Proxford.rb +++ b/Formula/tezos-baker-Proxford.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerProxford.version}/" - sha256 cellar: :any, big_sur: "2ae25ec0a6c36807accad1e0c8c1be36d71addc81399fbf783f9ae7d183fb448" - sha256 cellar: :any, arm64_big_sur: "0b67d1791f3dc27e7d343ee47b0c6632367cb15b193376de4229b1a0a1e75ac8" - sha256 cellar: :any, monterey: "9602cb7a47c3f12b8588e5cd7dd37fa690d774bfed5c7d16f6a945081e2436ea" end def make_deps diff --git a/Formula/tezos-baker-PtNairob.rb b/Formula/tezos-baker-PtNairob.rb index e4ddf3ced..0b3e01687 100644 --- a/Formula/tezos-baker-PtNairob.rb +++ b/Formula/tezos-baker-PtNairob.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtnairob.version}/" - sha256 cellar: :any, big_sur: "c78380649af37dda352e910bbcca73fec153eb4079495f90f100616ee31d14a5" - sha256 cellar: :any, arm64_big_sur: "751529aca4f074b34e43664602674d3260fbf5f53704d22919909937ce817b83" - sha256 cellar: :any, monterey: "ee4417565f068a2d4c9c6d8576df78988fb40a53cc6165a64fabdba33f80698e" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 83b741c70..ef5884498 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" - sha256 cellar: :any, big_sur: "608abcfebdadf03b1f7abf141cf9507c27e6adfb17ff698206f66fc14af4fa8c" - sha256 cellar: :any, arm64_big_sur: "bd9818fc94250d933ef1dca63ef0af8fd0d6e3d4469def40568eb53adc525e50" - sha256 cellar: :any, monterey: "8bce0d71de2f2e941402b78efa978d940bed2e4062dc08786e1baeffd7232812" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index 95a23923f..8a565f9b6 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" - sha256 cellar: :any, big_sur: "c6d64f3da2960ff549fccf08b470f5a0722ed9c2cc268d13d7e3f963b8a14f68" - sha256 cellar: :any, arm64_big_sur: "9a526b995025dd7e1c51193d229473858b284be77d92b1aaf5c5346c50d3b82b" - sha256 cellar: :any, monterey: "8f5571e8e43fea3caf74ea1edab090f0b2812aa847f68ee7f82c94adedc4362c" end def make_deps diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb index f5908b00a..d4706818f 100644 --- a/Formula/tezos-dac-client.rb +++ b/Formula/tezos-dac-client.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/" - sha256 cellar: :any, big_sur: "c08f4f6d0df58951d894c2b19dc9c60b5c56c9d5bed6c0e9dd8967a97ab0089a" - sha256 cellar: :any, arm64_big_sur: "a859f17b146f8e8a50ef0d43cb0b1fcf85aa24dc75ddaddd1ca49ddcf997643a" - sha256 cellar: :any, monterey: "e3fd536dd16b972d495e2e32435dd7abb12eb154864f3ec458c73860d009fa74" end def make_deps diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb index 346bad0ec..e0588477a 100644 --- a/Formula/tezos-dac-node.rb +++ b/Formula/tezos-dac-node.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/" - sha256 cellar: :any, big_sur: "40c1f00199d4b4b06b24e17e3ad1830a2283c6434173cec7f391bb9984939ce1" - sha256 cellar: :any, arm64_big_sur: "e274c4ff0f75604284519e210a94b8df20b547bbc0d414fe57a980501668984c" - sha256 cellar: :any, monterey: "d1b51bf8c37ba3fae82281e9d302441715624021942d65c672534f4557e0b920" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index 2fd11880e..fb8c18494 100644 --- a/Formula/tezos-node-ghostnet.rb +++ b/Formula/tezos-node-ghostnet.rb @@ -3,7 +3,7 @@ class TezosNodeGhostnet < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index 861b296f0..a1e4a98eb 100644 --- a/Formula/tezos-node-mainnet.rb +++ b/Formula/tezos-node-mainnet.rb @@ -3,7 +3,7 @@ class TezosNodeMainnet < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-nairobinet.rb b/Formula/tezos-node-nairobinet.rb index dbad7d256..7dc4e2ae5 100644 --- a/Formula/tezos-node-nairobinet.rb +++ b/Formula/tezos-node-nairobinet.rb @@ -5,7 +5,7 @@ class TezosNodeNairobinet < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index fc80851bc..a67d6545a 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" - sha256 cellar: :any, big_sur: "50074413c2afa2c18b8954fcfb15d331f3d81dc8ffc9046d7b8b7e8d5627c6ba" - sha256 cellar: :any, arm64_big_sur: "75491dbeca933c04c2c2ec181f85c63ddf27e1b1e2cb8bee2b9422de5c790dd7" - sha256 cellar: :any, monterey: "318cdaf2fc26346e419b641f6be2ea29ed334b087d3213ba0927e1b9b7b2d4a6" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 638311fff..a37b61bce 100644 --- a/Formula/tezos-signer-http.rb +++ b/Formula/tezos-signer-http.rb @@ -3,7 +3,7 @@ class TezosSignerHttp < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 25c6afe87..5700b96b8 100644 --- a/Formula/tezos-signer-https.rb +++ b/Formula/tezos-signer-https.rb @@ -3,7 +3,7 @@ class TezosSignerHttps < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index a4f503613..d6770d4a7 100644 --- a/Formula/tezos-signer-tcp.rb +++ b/Formula/tezos-signer-tcp.rb @@ -3,7 +3,7 @@ class TezosSignerTcp < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 9cd938bf5..3433b1b5a 100644 --- a/Formula/tezos-signer-unix.rb +++ b/Formula/tezos-signer-unix.rb @@ -3,7 +3,7 @@ class TezosSignerUnix < Formula url "file:///dev/null" - version "v18.1-1" + version "v19.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index 46bf5cabc..3f9f23bbe 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" - sha256 cellar: :any, big_sur: "48f328e31389c3bb8840445c53b12c7135d2efaef026f18ee1dabd65e2f23ca4" - sha256 cellar: :any, arm64_big_sur: "106e8a90fd000a78429916b48da6b60d75ad45b410982056c2a1eef053174f8a" - sha256 cellar: :any, monterey: "973551876fa36afba43bf78a7323b575e1a94706e4f5163380fa143c9072c1ff" end def make_deps diff --git a/Formula/tezos-smart-rollup-client-Proxford.rb b/Formula/tezos-smart-rollup-client-Proxford.rb index e0200f13b..4bcf325d5 100644 --- a/Formula/tezos-smart-rollup-client-Proxford.rb +++ b/Formula/tezos-smart-rollup-client-Proxford.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientProxford.version}/" - sha256 cellar: :any, big_sur: "4daff8a29e8f5db2efb83c6939b4a20f8076250c96f9da8713ddf836b823a03e" - sha256 cellar: :any, arm64_big_sur: "60b43a409235d8d52e2141a3474bb51887731f901fab8d363dde429c7899edf1" - sha256 cellar: :any, monterey: "5565e74bff9ccc7ded44b550562669b86b5e8ceaa2052b410c082cff63d58c56" end def make_deps diff --git a/Formula/tezos-smart-rollup-client-PtNairob.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb index 9b16f6f1a..77cb94ab7 100644 --- a/Formula/tezos-smart-rollup-client-PtNairob.rb +++ b/Formula/tezos-smart-rollup-client-PtNairob.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientPtnairob.version}/" - sha256 cellar: :any, big_sur: "6f3504230bb77757403ddfa25eef788351ada39ddb3109328963378090386a38" - sha256 cellar: :any, arm64_big_sur: "8ff434c4310ec7193efab48dbc17517c117758928b9236f622099607d551da96" - sha256 cellar: :any, monterey: "ca790dbd0a721d5e89ea43dabdcde671aa0feaa3895221496b3c19401adb7f5d" end def make_deps diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb index aaa853eb1..4949c5859 100644 --- a/Formula/tezos-smart-rollup-node.rb +++ b/Formula/tezos-smart-rollup-node.rb @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,9 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/" - sha256 cellar: :any, big_sur: "154ddf194df246355f55890f8191f73ebfc5b19e1dd494f6548efbb9a907454a" - sha256 cellar: :any, arm64_big_sur: "b1e852ffe893c84b0b6a246b71007c0339e076e3ebe873f6a0ed2fabd5b9f101" - sha256 cellar: :any, monterey: "07328eb0fc4639d19d2736d0342311c9842bc10050af9a644756a3802462c6d1" end def make_deps diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index 014ced71c..4c937140b 100644 --- a/Formula/tezos-smart-rollup-wasm-debugger.rb +++ b/Formula/tezos-smart-rollup-wasm-debugger.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - version "v18.1-1" + version "v19.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/" - sha256 cellar: :any, big_sur: "87442c2378e5fc9d10106231214043d89f570e7a45b336e9a7e6d44ba755c6c0" - sha256 cellar: :any, arm64_big_sur: "ad699dc074ea559a99c1233936c81d9c38a9b8968290fd65995cb6f5a9413b7b" - sha256 cellar: :any, monterey: "ffa410501b189022103f78507e03ec672988a0fdda601221123bbfe6ef18d9ad" end def make_deps From 775cb85da06ca5f97c25b6e400a279ac3f258298 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 6 Dec 2023 12:08:01 +0000 Subject: [PATCH 3/7] [Chore] Reset release number for v19.0-rc1 --- baking/pyproject.toml | 2 +- meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/baking/pyproject.toml b/baking/pyproject.toml index 466857f1e..dfb6eaae7 100644 --- a/baking/pyproject.toml +++ b/baking/pyproject.toml @@ -14,7 +14,7 @@ description = "Package that provides systemd services that orchestrate other ser license = { text = "LicenseRef-MIT-OA" } requires-python = ">=3.8" readme = "README.md" -version = "v18.1a" +version = "v19.0-rc1" [tool.setuptools.packages.find] where= ["src"] diff --git a/meta.json b/meta.json index fd8ee20a4..db155e2d6 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "2", + "release": "1", "maintainer": "Serokell ", "tezos_ref": "v19.0-rc1" } From e0f105d18062f3cfcb94c2eb3209dd8b9e470276 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 6 Dec 2023 12:08:01 +0000 Subject: [PATCH 4/7] [Chore] Reset letter_version for v19.0-rc1 --- docker/package/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/package/model.py b/docker/package/model.py index 4c2b64de9..4fd7b8c59 100644 --- a/docker/package/model.py +++ b/docker/package/model.py @@ -585,7 +585,7 @@ class TezosBakingServicesPackage(AbstractPackage): # native releases, so we append an extra letter to the version of # the package. # This should be reset to "" whenever the native version is bumped. - letter_version = "a" + letter_version = "" buildfile = "setup.py" From 200bf7df41479f6aae260291711b47db3c0a6c81 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Wed, 6 Dec 2023 16:19:56 +0300 Subject: [PATCH 5/7] [Chore] Add hack for pyml Problem: pyml package build failed, because it's tarball haven't produced any dirs. Solution: Set current dir as source root. --- nix/build/hacks.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix index acc1d506f..1dba67e6e 100644 --- a/nix/build/hacks.nix +++ b/nix/build/hacks.nix @@ -47,4 +47,7 @@ self: super: rec { ocamlfind = super.ocamlfind.overrideAttrs (drv: { patches = [ ./install_topfind_196.patch ]; }); + pyml = super.pyml.overrideAttrs (drv: { + sourceRoot = "."; + }); } From bb6189ad7535e6b0ef2e306169e3f459736f92cc Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Wed, 6 Dec 2023 16:20:54 +0300 Subject: [PATCH 6/7] [Chore] Remove smart rollup client Problem: smart rollup client got deprecated. Solution: Remove it. --- .github/workflows/build-bottles.yml | 2 +- Formula/tezos-smart-rollup-client-Proxford.rb | 62 ------------------- Formula/tezos-smart-rollup-client-PtNairob.rb | 62 ------------------- docker/docker-static-build.sh | 2 +- docker/package/packages.py | 24 ------- docker/tests/binaries.json | 5 +- nix/build/release-binaries.nix | 8 --- scripts/build-all-bottles.sh | 2 +- 8 files changed, 4 insertions(+), 163 deletions(-) delete mode 100644 Formula/tezos-smart-rollup-client-Proxford.rb delete mode 100644 Formula/tezos-smart-rollup-client-PtNairob.rb diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index f293fd04a..7c4ca9247 100644 --- a/.github/workflows/build-bottles.yml +++ b/.github/workflows/build-bottles.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ { id: macos-12, name: "monterey" } ] # we don't bottle meta-formulas that contain only services - formula: [tezos-accuser-PtNairob, tezos-accuser-Proxford, tezos-admin-client, tezos-baker-PtNairob, tezos-baker-Proxford, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-client-Proxford, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-smart-rollup-wasm-debugger] + formula: [tezos-accuser-PtNairob, tezos-accuser-Proxford, tezos-admin-client, tezos-baker-PtNairob, tezos-baker-Proxford, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-smart-rollup-wasm-debugger] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/Formula/tezos-smart-rollup-client-Proxford.rb b/Formula/tezos-smart-rollup-client-Proxford.rb deleted file mode 100644 index 4bcf325d5..000000000 --- a/Formula/tezos-smart-rollup-client-Proxford.rb +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env ruby -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosSmartRollupClientProxford < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - - version "v19.0-rc1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] - build_dependencies.each do |dependency| - depends_on dependency => :build - end - - dependencies = %w[gmp hidapi libev tezos-sapling-params] - dependencies.each do |dependency| - depends_on dependency - end - desc "Smart contract rollup CLI client for Proxford" - - bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientProxford.version}/" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Force linker to use libraries from the current brew installation. - # Workaround for https://github.com/serokell/tezos-packaging/issues/700 - 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.64.0", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - 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(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - make_deps - install_template "src/proto_018_Proxford/bin_sc_rollup_client/main_sc_rollup_client_018_Proxford.exe", - "_build/default/src/proto_018_Proxford/bin_sc_rollup_client/main_sc_rollup_client_018_Proxford.exe", - "octez-smart-rollup-client-Proxford" - end -end diff --git a/Formula/tezos-smart-rollup-client-PtNairob.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb deleted file mode 100644 index 77cb94ab7..000000000 --- a/Formula/tezos-smart-rollup-client-PtNairob.rb +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env ruby -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosSmartRollupClientPtnairob < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0-rc1", :shallow => false - - version "v19.0-rc1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] - build_dependencies.each do |dependency| - depends_on dependency => :build - end - - dependencies = %w[gmp hidapi libev tezos-sapling-params] - dependencies.each do |dependency| - depends_on dependency - end - desc "Smart contract rollup CLI client for PtNairob" - - bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientPtnairob.version}/" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Force linker to use libraries from the current brew installation. - # Workaround for https://github.com/serokell/tezos-packaging/issues/700 - 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.64.0", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - 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(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - make_deps - install_template "src/proto_017_PtNairob/bin_sc_rollup_client/main_sc_rollup_client_017_PtNairob.exe", - "_build/default/src/proto_017_PtNairob/bin_sc_rollup_client/main_sc_rollup_client_017_PtNairob.exe", - "octez-smart-rollup-client-PtNairob" - end -end diff --git a/docker/docker-static-build.sh b/docker/docker-static-build.sh index 1ad6badf2..6cb137bfc 100755 --- a/docker/docker-static-build.sh +++ b/docker/docker-static-build.sh @@ -13,7 +13,7 @@ if [ -z ${OCTEZ_EXECUTABLES+x} ]; then binaries=("octez-admin-client" "octez-dac-client" "octez-dac-node" "octez-client" "octez-node" "octez-signer" "octez-codec" "octez-smart-rollup-wasm-debugger" "octez-smart-rollup-node") for proto in $(jq -r ".active | .[]" ../protocols.json); do - binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-smart-rollup-client-$proto") + binaries+=("octez-accuser-$proto" "octez-baker-$proto") done OCTEZ_EXECUTABLES="$( IFS=$' '; echo "${binaries[*]}" )" diff --git a/docker/package/packages.py b/docker/package/packages.py index c9ca8cede..3a9e0b242 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -550,30 +550,6 @@ def mk_rollup_node(): } -def mk_rollup_clients(*protos): - def mk_rollup_client_package(proto): - proto_snake_case = protocol_numbers[proto] + "_" + proto - return TezosBinaryPackage( - f"tezos-smart-rollup-client-{proto}", - f"Tezos smart rollup client using {proto}", - meta=packages_meta, - target_proto=proto, - additional_native_deps=[ - "tezos-client", - "tezos-node", - "tezos-sapling-params", - ], - postinst_steps=daemon_postinst_common, - dune_filepath=f"src/proto_{proto_snake_case}/bin_sc_rollup_client/main_sc_rollup_client_{proto_snake_case}.exe", - ) - - return [ - {f"tezos-smart-rollup-client-{proto}": mk_rollup_client_package(proto)} - for proto in protos - ] - - packages.append(mk_rollup_node()) -packages.extend(mk_rollup_clients("PtNairob", "Proxford")) packages = dict(ChainMap(*packages)) diff --git a/docker/tests/binaries.json b/docker/tests/binaries.json index 1140125e5..578cf9167 100644 --- a/docker/tests/binaries.json +++ b/docker/tests/binaries.json @@ -19,10 +19,7 @@ "tezos-smart-rollup-wasm-debugger" ], "candidates": [ - "tezos-smart-rollup-client-Proxford", - "tezos-smart-rollup-client-PtNairob", - "tezos-smart-rollup-node-Proxford", - "tezos-smart-rollup-node-PtNairob", + "tezos-smart-rollup-node", "tezos-baking", "tezos-sapling-params", "tezos-accuser-Proxford", diff --git a/nix/build/release-binaries.nix b/nix/build/release-binaries.nix index c543c8052..21686e178 100644 --- a/nix/build/release-binaries.nix +++ b/nix/build/release-binaries.nix @@ -92,12 +92,4 @@ in [ ''; supports = protocol; } - { - name = "octez-smart-rollup-client-${protocol}"; - description = '' - Smart contract rollup CLI client for ${protocol}. - For more info please check - https://tezos.gitlab.io/active/smart_rollups.html#tools - ''; - supports = protocol; - } ]) protocols.active diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index a4b6eadee..2811015b2 100755 --- a/scripts/build-all-bottles.sh +++ b/scripts/build-all-bottles.sh @@ -19,7 +19,7 @@ set -euo pipefail retval="0" # we don't bottle meta-formulas that contain only services -formulae=("tezos-accuser-PtNairob" "tezos-accuser-Proxford" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-baker-Proxford" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtNairob" "tezos-smart-rollup-client-Proxford" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-smart-rollup-wasm-debugger") +formulae=("tezos-accuser-PtNairob" "tezos-accuser-Proxford" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-baker-Proxford" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-smart-rollup-wasm-debugger") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. From 26d1ece8f83306e8d63b3eedd3932673b009e28f Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Wed, 6 Dec 2023 16:24:09 +0300 Subject: [PATCH 7/7] [Chore] Update rust version Problem: Recommended rust version is bumped. Solution: Use recommended rust version. --- 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-dac-client.rb | 2 +- Formula/tezos-dac-node.rb | 2 +- Formula/tezos-node.rb | 2 +- Formula/tezos-signer.rb | 2 +- Formula/tezos-smart-rollup-node.rb | 2 +- Formula/tezos-smart-rollup-wasm-debugger.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 8db3b8923..3adbf3460 100644 --- a/Formula/tezos-accuser-Proxford.rb +++ b/Formula/tezos-accuser-Proxford.rb @@ -39,7 +39,7 @@ def make_deps ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" # Here is the workaround to use opam 2.0 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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 a27f9368c..9feb0a373 100644 --- a/Formula/tezos-accuser-PtNairob.rb +++ b/Formula/tezos-accuser-PtNairob.rb @@ -39,7 +39,7 @@ def make_deps ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" # Here is the workaround to use opam 2.0 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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 91616fd63..b73464e68 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 e6a87b3cc..62807c63b 100644 --- a/Formula/tezos-baker-Proxford.rb +++ b/Formula/tezos-baker-Proxford.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 0b3e01687..706075109 100644 --- a/Formula/tezos-baker-PtNairob.rb +++ b/Formula/tezos-baker-PtNairob.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 ef5884498..2cda59ad1 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 8a565f9b6..81dde742a 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb index d4706818f..840e1bd7a 100644 --- a/Formula/tezos-dac-client.rb +++ b/Formula/tezos-dac-client.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb index e0588477a..f07ad5af9 100644 --- a/Formula/tezos-dac-node.rb +++ b/Formula/tezos-dac-node.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 a67d6545a..9b76b3d39 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 3f9f23bbe..63e353976 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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.rb b/Formula/tezos-smart-rollup-node.rb index 4949c5859..6734fd14f 100644 --- a/Formula/tezos-smart-rollup-node.rb +++ b/Formula/tezos-smart-rollup-node.rb @@ -41,7 +41,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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index 4c937140b..168fe4244 100644 --- a/Formula/tezos-smart-rollup-wasm-debugger.rb +++ b/Formula/tezos-smart-rollup-wasm-debugger.rb @@ -40,7 +40,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.64.0", "-y" + system "rustup-init", "--default-toolchain", "1.71.1", "-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 6419060e1..b11224d4b 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.64.0 -y +./rustup-init.sh --profile minimal --default-toolchain 1.71.1 -y