From 06bbbb9c718e88c53dcf89ccdd81e9ca3bc53cbe Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 11 Jun 2025 12:01:33 +0000 Subject: [PATCH 1/4] [Chore] Bump Tezos sources to v22.1 --- flake.lock | 12 ++++++------ meta.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index d2534fe9c..77d0d42e1 100644 --- a/flake.lock +++ b/flake.lock @@ -1243,11 +1243,11 @@ "opam-repository_2": { "flake": false, "locked": { - "lastModified": 1738066957, - "narHash": "sha256-zUOPhbEsAJprwvanDVDT3DSV1ioUjuGxMVYCYlzfd2E=", + "lastModified": 1748329542, + "narHash": "sha256-bx4cgSSa5vxFVaySWFsU6wGbUdHN/eMEPWkTpccf9sE=", "owner": "ocaml", "repo": "opam-repository", - "rev": "aa131f3eda80ed7121debe7582faaf50448bc105", + "rev": "e9ce8525130a382fac004612302b2f2268f4188c", "type": "github" }, "original": { @@ -1416,11 +1416,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1744025588, - "narHash": "sha256-I1Nr3ZxS6BS9zN3J818xpxBlT0bQtOCoE8wM2TUPT3E=", + "lastModified": 1749631672, + "narHash": "sha256-TuYBH94Hneg5PQ5hdLC09H6dErhqkRTVYy/vqPISvLE=", "owner": "tezos", "repo": "tezos", - "rev": "3f73c7248b6738e0263f242cd9fb149924e790b8", + "rev": "9758b259f7dd9de1fd4dbd0d4f63f2aac4465ddf", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index 31c6b3e45..fd3204b0b 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "3", "maintainer": "Serokell ", - "tezos_ref": "octez-v22.0" + "tezos_ref": "octez-v22.1" } From 40edf69c0e88cdb24076a32a3a0952212de9af1b Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 11 Jun 2025 12:01:33 +0000 Subject: [PATCH 2/4] [Chore] Update brew formulae for v22.1 --- Formula/tezos-accuser-PsQuebec.rb | 5 ++--- Formula/tezos-accuser-PsRiotum.rb | 5 ++--- Formula/tezos-admin-client.rb | 5 ++--- Formula/tezos-baker-PsQuebec.rb | 5 ++--- Formula/tezos-baker-PsRiotum.rb | 5 ++--- Formula/tezos-client.rb | 5 ++--- Formula/tezos-codec.rb | 5 ++--- Formula/tezos-dal-node.rb | 5 ++--- Formula/tezos-experimental-agnostic-baker.rb | 5 ++--- Formula/tezos-node-ghostnet.rb | 2 +- Formula/tezos-node-mainnet.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 ++--- 19 files changed, 32 insertions(+), 45 deletions(-) diff --git a/Formula/tezos-accuser-PsQuebec.rb b/Formula/tezos-accuser-PsQuebec.rb index c51643596..6a5f29357 100644 --- a/Formula/tezos-accuser-PsQuebec.rb +++ b/Formula/tezos-accuser-PsQuebec.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsquebec.version}/" - sha256 cellar: :any, ventura: "8dd32c7da31242466347e7dd4a02c28f171ede24921abc2e27f2a16544a07484" end def make_deps diff --git a/Formula/tezos-accuser-PsRiotum.rb b/Formula/tezos-accuser-PsRiotum.rb index ec784cac0..b96e6e096 100644 --- a/Formula/tezos-accuser-PsRiotum.rb +++ b/Formula/tezos-accuser-PsRiotum.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsriotum.version}/" - sha256 cellar: :any, ventura: "5d02e0b1ba973aa389909901eefc2a6db07d5c096d45837fc998e740247536cb" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index dcb9a3667..1f6f1e621 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" - sha256 cellar: :any, ventura: "aa92bfe2c20898eeab1a79240b212bb061431f01f2410986e64cdab60c94fe78" end def make_deps diff --git a/Formula/tezos-baker-PsQuebec.rb b/Formula/tezos-baker-PsQuebec.rb index fd65a1d4e..cb100d556 100644 --- a/Formula/tezos-baker-PsQuebec.rb +++ b/Formula/tezos-baker-PsQuebec.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsquebec.version}/" - sha256 cellar: :any, ventura: "6360de1e998e582e2b1f803383f0c70047b036d272d35fb01133cfc4b9ce0054" end def make_deps diff --git a/Formula/tezos-baker-PsRiotum.rb b/Formula/tezos-baker-PsRiotum.rb index 5c7e34f80..1415e47c7 100644 --- a/Formula/tezos-baker-PsRiotum.rb +++ b/Formula/tezos-baker-PsRiotum.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsriotum.version}/" - sha256 cellar: :any, ventura: "8958a6c79793afd817d4e71dd3ac8b3ddd6c5bea0dea98db640039d915a13774" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 6bff1ac2b..de7b8345e 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" - sha256 cellar: :any, ventura: "783f403456e51fccd016b10ffb41eea3d0e1e366eff78c966e30e9c921d464a7" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index d413c85d9..e98308a63 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" - sha256 cellar: :any, ventura: "0efe7eedc11adadb53d2faf4c36644dc7c64c7a28d4fe607f8e4d5b73a8127b3" end def make_deps diff --git a/Formula/tezos-dal-node.rb b/Formula/tezos-dal-node.rb index 69611c97f..969a327e5 100644 --- a/Formula/tezos-dal-node.rb +++ b/Formula/tezos-dal-node.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/" - sha256 cellar: :any, ventura: "e3b7ba496cfd9eed8cb557cf94429f1c44c8885641a7cef51d963503c8df433f" end def make_deps diff --git a/Formula/tezos-experimental-agnostic-baker.rb b/Formula/tezos-experimental-agnostic-baker.rb index daafb2dab..7d7eac930 100644 --- a/Formula/tezos-experimental-agnostic-baker.rb +++ b/Formula/tezos-experimental-agnostic-baker.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosExperimentalAgnosticBaker.version}/" - sha256 cellar: :any, ventura: "465170f635ef1217549098070fa518be3ef22a3257b4174efea0b077e5c2f2f7" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index 003f936a0..07aaea568 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 "v22.0-1" + version "v22.1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index d03d0c1e3..f534e8a8e 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 "v22.0-1" + version "v22.1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 07ef46dea..35fbe526b 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" - sha256 cellar: :any, ventura: "4ccbc37aa3da342ac7b528058bd03bf0190080992a1270a2c4b11a29c92eeaba" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 117c8d01d..d6ce25780 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 "v22.0-1" + version "v22.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index b4740b29a..4e0c5b1e2 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 "v22.0-1" + version "v22.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index 03cfb39d6..6088e4748 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 "v22.0-1" + version "v22.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index c80f04db7..c2d6c5091 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 "v22.0-1" + version "v22.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index a28831436..5e1bcc74f 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -26,7 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" - sha256 cellar: :any, ventura: "02b48dc4f9e860b6a04958619a9d631f7c149174f4969625685cb0aa3b2b3367" end def make_deps diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb index faa0fa7f6..d747dcedb 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -28,7 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/" - sha256 cellar: :any, ventura: "8f5182c7fc306379f142a9c6273788d76c6fba17921ac3b80c4eb21ca99c2c17" end def make_deps diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index 285354e9d..1116f872d 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 => "octez-v22.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.1", :shallow => false - version "v22.0-1" + version "v22.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| @@ -27,7 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/" - sha256 cellar: :any, ventura: "a13d53fa7c9248a62f69a93ab73a6d7c3e115555e92e39a8514c0f65c6267cc1" end def make_deps From 909da5f4ecf35889d3e7517c9f7d96d3baf8781d Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 11 Jun 2025 12:01:33 +0000 Subject: [PATCH 3/4] [Chore] Reset release number for v22.1 --- 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 121a5a39b..21778371a 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 = "v22.0" +version = "v22.1" [tool.setuptools.packages.find] where= ["src"] diff --git a/meta.json b/meta.json index fd3204b0b..2fb87962f 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "3", + "release": "1", "maintainer": "Serokell ", "tezos_ref": "octez-v22.1" } From 7eeeeffc11e49cf5e173a5ca1dd5e4f5dd52f8d6 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 11 Jun 2025 12:01:33 +0000 Subject: [PATCH 4/4] [Chore] Reset letter_version for v22.1 --- 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 b3251a2a3..04336acc2 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 = "b" + letter_version = "" buildfile = "setup.py"