From 84512b2e2fe2696b8e904ec904c9c9cf26fe8858 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Mon, 22 Jan 2024 19:16:50 +0300 Subject: [PATCH 1/8] [Chore] Fix find command in update-brew-formulae Problem: Last change introduced trailing slash at the end of line. Solution: Remove it. --- scripts/update-brew-formulae.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-brew-formulae.sh b/scripts/update-brew-formulae.sh index 49949825f..3495119f6 100755 --- a/scripts/update-brew-formulae.sh +++ b/scripts/update-brew-formulae.sh @@ -17,7 +17,7 @@ then -exec sed -i "/catalina/d" {} \; \ -exec sed -i "/monterey/d" {} \; \ -exec sed -i "/arm64_monterey/d" {} \; \ - -exec sed -i "/mojave/d" {} \; \ + -exec sed -i "/mojave/d" {} \; else echo "The argument does not look like a tag, which should have a form of 'v*-[0-9]*'" fi From c3bd6687dd708b4bb0931ac62ce144267be3140b Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Mon, 22 Jan 2024 19:22:16 +0300 Subject: [PATCH 2/8] [Chore] Bump Tezos sources to v19.0 --- flake.lock | 6 +++--- meta.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 744355aa9..101547847 100644 --- a/flake.lock +++ b/flake.lock @@ -1365,11 +1365,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1701727072, - "narHash": "sha256-Q8xJY2AlZBIoEexL6PZ6HvRt5UDaVGlte1CMkQWg83s=", + "lastModified": 1705915086, + "narHash": "sha256-R4YOHauaYx0vNzjgAmNSRMf86aiAQHvFaRcjHm4UB6I=", "owner": "tezos", "repo": "tezos", - "rev": "7769d51b1b846c281c8bd9d2f26d46c92954cefd", + "rev": "10b119feab01be49e1c38ff61469d3e1f8480a6e", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index fd8ee20a4..294dfb59c 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "2", "maintainer": "Serokell ", - "tezos_ref": "v19.0-rc1" + "tezos_ref": "v19.0" } From 8f74799627904962c4a3d1fd95d21c515ca1676e Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Mon, 22 Jan 2024 19:22:35 +0300 Subject: [PATCH 3/8] [Chore] Update brew formulae for v19.0 --- Formula/tezos-accuser-Proxford.rb | 5 ++--- Formula/tezos-accuser-PtNairob.rb | 5 ++--- Formula/tezos-admin-client.rb | 5 ++--- Formula/tezos-baker-Proxford.rb | 5 ++--- Formula/tezos-baker-PtNairob.rb | 5 ++--- Formula/tezos-client.rb | 5 ++--- Formula/tezos-codec.rb | 5 ++--- Formula/tezos-dac-client.rb | 5 ++--- Formula/tezos-dac-node.rb | 5 ++--- Formula/tezos-node-ghostnet.rb | 2 +- Formula/tezos-node-mainnet.rb | 2 +- Formula/tezos-node-nairobinet.rb | 2 +- Formula/tezos-node.rb | 5 ++--- 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 | 5 ++--- Formula/tezos-smart-rollup-node.rb | 5 ++--- Formula/tezos-smart-rollup-wasm-debugger.rb | 5 ++--- 20 files changed, 33 insertions(+), 46 deletions(-) diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb index 89a5f7805..0ee772791 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserProxford.version}/" sha256 cellar: :any, big_sur: "fd4e625b5544d0b5940f95417d5339d2c971f6f104b1ba2f6feff6bd531aa673" sha256 cellar: :any, arm64_big_sur: "a7105d3fc24da2dcbac686e0e36a8df71450ba02abe44d9f945b605b2a3dd36f" - sha256 cellar: :any, monterey: "b2bd4c2f90c8c8e1025db6f0d4a79318f01bb094a5175c49568c61f3fadf7168" end def make_deps diff --git a/Formula/tezos-accuser-PtNairob.rb b/Formula/tezos-accuser-PtNairob.rb index e079f4cd0..cb7ddc901 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtnairob.version}/" sha256 cellar: :any, big_sur: "55724e5686be00bd3938bda2c54b3d343e97663ce566c4be599a595b9462ec1f" sha256 cellar: :any, arm64_big_sur: "5b450ddd46c42e39bfbb039a50e392605e1e705fdc5d143554c68d8cfe74be12" - sha256 cellar: :any, monterey: "d65861c2abeddbe0218f7fc852af44d9654877ccf62fdc31b0a4cadc9ae2a22f" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index d068291cc..b12841def 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" sha256 cellar: :any, big_sur: "27343ca502ed9e828b035f1cdc160c5e5b048204df511cd85e039c9982b755b1" sha256 cellar: :any, arm64_big_sur: "522a74cd3cc9de7fda9f4082549f498d74735a2fc5f15a27eefe3027d4735c38" - sha256 cellar: :any, monterey: "73c401a72c26aae5116b279938c61ff149082cf4cf90710e60b7409e862aae87" end def make_deps diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb index db1291845..2e102f01d 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerProxford.version}/" sha256 cellar: :any, big_sur: "873c62e2ebc0a13c640a4ad5c55d8e09f529e476b89b30feec17ef8d726605a1" sha256 cellar: :any, arm64_big_sur: "8238d3f7345f9a980c7ac666ae56841eddf8651095007b581b4bc0192a0cf4b4" - sha256 cellar: :any, monterey: "7d5c80d63edc24f7b208d667871857f8a81c8e944db199a0c4af3e45fa6a7d1b" end def make_deps diff --git a/Formula/tezos-baker-PtNairob.rb b/Formula/tezos-baker-PtNairob.rb index 55085434f..26e6682a0 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtnairob.version}/" sha256 cellar: :any, big_sur: "f29291e66c8a9d9e7c50b43b9a31558c7c196ae227a61a653550e6a8d74a78fd" sha256 cellar: :any, arm64_big_sur: "023f880ad07e770fdc126fdf64fbeae4f4d2d9965edb9368723cb8dd2b277b5d" - sha256 cellar: :any, monterey: "ae69022901af2df368ccaf668ee032b84605edf11002f3f7fda1f74b48dd8fe6" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 801666e8a..8c514e29c 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" sha256 cellar: :any, big_sur: "8009785bed03b47ddf5664c748483c5383f975a5246d086698b29af70c45a7d7" sha256 cellar: :any, arm64_big_sur: "539d9ae0e60d869c1b0c802a03eac74662eb2a3ba34d2c86c96aeab47f371261" - sha256 cellar: :any, monterey: "a955c0874ae69c8e10f703d904c4e4824f171e79c62b0dafedbe960cdd9fb13a" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index b2a181587..2d2c0d267 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" sha256 cellar: :any, big_sur: "0095d22da1abdbd39fb09cfadc4d7a9550e3509bc121734d4f9948a03be2c04e" sha256 cellar: :any, arm64_big_sur: "43185c34a547b845ecf5c684d0e301e25e1ed93e82b332c86ff427de501393c9" - sha256 cellar: :any, monterey: "7bf363987c4891f76cb3c6cc5f98d947bceda14c049843a519aacc3c21c017f6" end def make_deps diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb index 7ecfc5368..4f81b272e 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/" sha256 cellar: :any, big_sur: "caa1a08c2e1963834542172dcc35e9a5e7b230cee802f88ecbfbf117a58145ad" sha256 cellar: :any, arm64_big_sur: "ddc411ed21e93b9c054f63aebf3da546e1682fe7d144868f27c5c15a14a309de" - sha256 cellar: :any, monterey: "96b26b5758e73f1cb64bd7ad2fe961d13b259096bb73d7eed944a2630bcb4408" end def make_deps diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb index 387c3135e..fda74c610 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/" sha256 cellar: :any, big_sur: "a595b7f6860b365c68504c972b44f226e8d13e2839a1baf7eab1ae12ec159a3c" sha256 cellar: :any, arm64_big_sur: "4b1a83a542429af77ea126ac6f00fce8494bc2d847229347908d69db9a79da39" - sha256 cellar: :any, monterey: "86eea2d30f378a4cd73ed52c28b6da8bc97f49e9d99a4e99c9f952243a30781f" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index fb8c18494..fc3cd1088 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index a1e4a98eb..4e7cef971 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-nairobinet.rb b/Formula/tezos-node-nairobinet.rb index 7dc4e2ae5..362f24e1b 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index bce65dfbe..6dcf7fd8d 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" sha256 cellar: :any, big_sur: "bdc799d7154b43572c890574c5f7b492ac9955ade477e43a8803f74efb06ef91" sha256 cellar: :any, arm64_big_sur: "e436c0b9385cef8a396458589da275d20e279dfcfa177f07babd3f3eb294aff1" - sha256 cellar: :any, monterey: "283c5475047d9155538ca647dcbeb9ff0003a575e4c024c4881293346455e3b1" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index a37b61bce..464067fd1 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 5700b96b8..0815f4ab4 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index d6770d4a7..a6e2192df 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 3433b1b5a..be4c1d853 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 "v19.0-rc1-1" + version "v19.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index e3c2c25aa..eda4c86ca 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" sha256 cellar: :any, big_sur: "395050d76f4ea9ffafc6d71f3823914a36c9c981e3e00d64081ae41d04e40aa1" sha256 cellar: :any, arm64_big_sur: "ef0b074188ffe5e85a42c4019c5fa360cf0f2c9569396e2d041c17cb925a3719" - sha256 cellar: :any, monterey: "33960eb58522ddc3959cdfa5a45017da3362ffcda9b6549201311060ec1bb6eb" end def make_deps diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb index 60af13126..a8a8e78a7 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -30,7 +30,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/" sha256 cellar: :any, big_sur: "251e9a13795ad3a3d6e873546dd368e9ac52702ba21ab50aaea43b15cbab0da2" sha256 cellar: :any, arm64_big_sur: "25b107bc1cfabd7c5b02bcb8da63b73e80ed516f3ce849afb729f6f9add2627f" - sha256 cellar: :any, monterey: "ed0cb153141fd61d90070aa17b957a7dd62e47e2eb7aae6bc86ff1383c3204b7" end def make_deps diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index d084b56ca..721b0fb6c 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 => "v19.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v19.0", :shallow => false - version "v19.0-rc1-1" + version "v19.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -29,7 +29,6 @@ class << self root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/" sha256 cellar: :any, big_sur: "533531784f3f62137a429838ccdd8553948011e1def6b350d602150392a6377e" sha256 cellar: :any, arm64_big_sur: "e0c0172b5ef058a299842f565a105a909cc2b51cd687dcc6c3b7e3a1ea859892" - sha256 cellar: :any, monterey: "4be9433eb723bd8d0168d6c47cc6a005d9482ddf8bb0ebee40f01d6cfd992fc5" end def make_deps From b65688dff6b8802e83f532f1fd3ea82981780bfb Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Mon, 22 Jan 2024 19:22:36 +0300 Subject: [PATCH 4/8] [Chore] Reset release number for v19.0 --- 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 1290e2189..18368c43c 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 = "v19.0-rc1a" +version = "v19.0" [tool.setuptools.packages.find] where= ["src"] diff --git a/meta.json b/meta.json index 294dfb59c..9aafa8400 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "2", + "release": "1", "maintainer": "Serokell ", "tezos_ref": "v19.0" } From 57fe52acc2dd68d999e2fdafd0fff4a7c3c4e6ca Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Mon, 22 Jan 2024 19:22:37 +0300 Subject: [PATCH 5/8] [Chore] Reset letter_version for v19.0 --- 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 b7ea9c8e9f50083e0328fb427b73dbbf7cc874c6 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Mon, 22 Jan 2024 19:22:38 +0300 Subject: [PATCH 6/8] [Chore] Update release binaries for v19.0 --- .github/workflows/build-bottles.yml | 2 +- scripts/build-all-bottles.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 72aecb20c..1152b395a 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-node, tezos-dac-client, tezos-dac-node, tezos-smart-rollup-wasm-debugger] + formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-Proxford, tezos-baker-Proxford, tezos-accuser-PtNairob, tezos-baker-PtNairob] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index 2811015b2..7ba25d759 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-node" "tezos-dac-client" "tezos-dac-node" "tezos-smart-rollup-wasm-debugger") +formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-node" "tezos-accuser-Proxford" "tezos-baker-Proxford" "tezos-accuser-PtNairob" "tezos-baker-PtNairob") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. From 78ba5cb45de2e4edbfda7a9df50c81fc83376584 Mon Sep 17 00:00:00 2001 From: krendelhoff2 Date: Wed, 24 Jan 2024 12:16:35 +0300 Subject: [PATCH 7/8] [Chore] Change top level domain for teztnets Problem: `teztnets.xyz` will be down at 1 Feb. Solution: Use `teztnets.com`. --- Formula/tezos-node-nairobinet.rb | 6 +++--- baking/src/tezos_baking/tezos_setup_wizard.py | 2 +- baking/src/tezos_baking/wizard_structure.py | 2 +- docker/package/packages.py | 4 ++-- docs/baking.md | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Formula/tezos-node-nairobinet.rb b/Formula/tezos-node-nairobinet.rb index 362f24e1b..d8b31390d 100644 --- a/Formula/tezos-node-nairobinet.rb +++ b/Formula/tezos-node-nairobinet.rb @@ -27,13 +27,13 @@ def install echo "Configuring the node..." "$node" config init \ --rpc-addr "$NODE_RPC_ADDR" \ - --network=https://teztnets.xyz/nairobinet\ + --network=https://teztnets.com/nairobinet\ "$@" else echo "Updating the node configuration..." "$node" config update \ --rpc-addr "$NODE_RPC_ADDR" \ - --network=https://teztnets.xyz/nairobinet\ + --network=https://teztnets.com/nairobinet\ "$@" fi @@ -61,6 +61,6 @@ def install def post_install mkdir_p "#{var}/lib/tezos/node-nairobinet" - system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-nairobinet", "--network", "https://teztnets.xyz/nairobinet" + system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-nairobinet", "--network", "https://teztnets.com/nairobinet" end end diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index 9a46184a5..57bcfdef1 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -208,7 +208,7 @@ def network_name_or_teztnets_url(network): if is_non_protocol_testnet(network): return network else: - return f"https://teztnets.xyz/{network}" + return f"https://teztnets.com/{network}" compatible_snapshot_version = 7 diff --git a/baking/src/tezos_baking/wizard_structure.py b/baking/src/tezos_baking/wizard_structure.py index 7114eddda..17d755e6b 100644 --- a/baking/src/tezos_baking/wizard_structure.py +++ b/baking/src/tezos_baking/wizard_structure.py @@ -309,7 +309,7 @@ def import_key(self, key_mode_query, ledger_app=None): print( f"Before proceeding with baker registration you'll need to provide this address with some XTZ.\n" f"Note that you need at least 6000 XTZ in order to receive baking and endorsing rights.\n" - f"You can fill your address using the faucet: https://faucet.{network}.teztnets.xyz/.\n" + f"You can fill your address using the faucet: https://faucet.{network}.teztnets.com/.\n" f"Waiting for funds to arrive... (Ctrl + C to choose another option)." ) try: diff --git a/docker/package/packages.py b/docker/package/packages.py index c01b6ab88..d9db179d4 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -19,8 +19,8 @@ networks = { "mainnet": "mainnet", "ghostnet": "ghostnet", - "nairobinet": "https://teztnets.xyz/nairobinet", - "oxfordnet": "https://teztnets.xyz/oxfordnet", + "nairobinet": "https://teztnets.com/nairobinet", + "oxfordnet": "https://teztnets.com/oxfordnet", } networks_protos = { "mainnet": ["PtNairob"], diff --git a/docs/baking.md b/docs/baking.md index 9ffd85e60..0b28b738b 100644 --- a/docs/baking.md +++ b/docs/baking.md @@ -187,7 +187,7 @@ In order to import such a key, run: sudo -u tezos tezos-client import secret key baker ``` -1) Alternatively, you can generate a fresh baker key and fill it using faucet from https://teztnets.xyz. +1) Alternatively, you can generate a fresh baker key and fill it using faucet from https://teztnets.com. In order to generate a fresh key run: ``` @@ -195,7 +195,7 @@ sudo -u tezos tezos-client gen keys baker ``` The newly generated address will be displayed as a part of the command output. -Then visit https://teztnets.xyz and fill the address with at least 6000 XTZ on the desired testnet. +Then visit https://teztnets.com and fill the address with at least 6000 XTZ on the desired testnet. ### Registering the baker From 10fc7a4e06b14213cfbe58d7ca374ab068159564 Mon Sep 17 00:00:00 2001 From: krendelhoff2 Date: Wed, 24 Jan 2024 12:17:51 +0300 Subject: [PATCH 8/8] [Chore] Change default snapshot provider Problem: xtz-shots snapshot provider seem to be down and it is unclear if it will become alive. Solution: Use marigold as default provider. --- baking/src/tezos_baking/tezos_setup_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index 57bcfdef1..65816387d 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -54,7 +54,7 @@ "marigold.dev": "https://snapshots.tezos.marigold.dev/api/tezos-snapshots.json", } -recommended_provider = list(default_providers.keys())[0] +recommended_provider = list(default_providers.keys())[1] TMP_SNAPSHOT_LOCATION = "/tmp/octez_node.snapshot.d/"