diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 08daa1e26..1d042e466 100644 --- a/.github/workflows/build-bottles.yml +++ b/.github/workflows/build-bottles.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ { id: macos-13, name: "ventura" } ] # we don't bottle meta-formulas that contain only services - formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-experimental-agnostic-baker, tezos-node, tezos-accuser-PsRiotum, tezos-baker-PsRiotum, tezos-accuser-PsQuebec, tezos-baker-PsQuebec] + formula: [tezos-smart-rollup-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-accuser, tezos-baker, tezos-node, tezos-accuser-PtSeouLo, tezos-baker-PtSeouLo, tezos-accuser-PsRiotum, tezos-baker-PsRiotum] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/Formula/tezos-accuser-PsQuebec.rb b/Formula/tezos-accuser-PsQuebec.rb index c51643596..c4e0d40d5 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..8057ac06d 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..5d3b2eb50 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..367cfb2e8 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..4018fd3ed 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..0e8c60bae 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..01c4ace2d 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..9347d8f9b 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..66789ceae 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..3dbe29f7c 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 "v23.2-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index d03d0c1e3..7de85d09b 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 "v23.2-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 07ef46dea..9cd3de159 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..a24ca9f74 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 "v23.2-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index b4740b29a..91234802f 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 "v23.2-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index 03cfb39d6..585d0f781 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 "v23.2-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index c80f04db7..07d05107c 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 "v23.2-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index a28831436..1adc2c08a 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..5ce7014e9 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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..340345332 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-v23.2", :shallow => false - version "v22.0-1" + version "v23.2-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 diff --git a/baking/pyproject.toml b/baking/pyproject.toml index 121a5a39b..e3910ee7c 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 = "v23.2" [tool.setuptools.packages.find] where= ["src"] diff --git a/docker/active-protocols b/docker/active-protocols index e35a63053..77c742e54 100644 --- a/docker/active-protocols +++ b/docker/active-protocols @@ -1,3 +1,3 @@ -PsQuebec PsRiotum +PtSeouLo alpha diff --git a/docker/octez-executables b/docker/octez-executables index b8e8fe93f..62d7fb633 100644 --- a/docker/octez-executables +++ b/docker/octez-executables @@ -1,13 +1,13 @@ -octez-smart-rollup-wasm-debugger octez-smart-rollup-node octez-dal-node octez-signer octez-codec octez-client octez-admin-client -octez-experimental-agnostic-baker +octez-accuser +octez-baker octez-node +octez-accuser-PtSeouLo +octez-baker-PtSeouLo octez-accuser-PsRiotum octez-baker-PsRiotum -octez-accuser-PsQuebec -octez-baker-PsQuebec 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" diff --git a/docker/tests/binaries.json b/docker/tests/binaries.json index 428bec4cd..b216113e5 100644 --- a/docker/tests/binaries.json +++ b/docker/tests/binaries.json @@ -1,18 +1,18 @@ { "released": [ - "tezos-smart-rollup-wasm-debugger", "tezos-smart-rollup-node", "tezos-dal-node", "tezos-signer", "tezos-codec", "tezos-client", "tezos-admin-client", - "tezos-experimental-agnostic-baker", + "tezos-accuser", + "tezos-baker", "tezos-node", + "tezos-accuser-PtSeouLo", + "tezos-baker-PtSeouLo", "tezos-accuser-PsRiotum", "tezos-baker-PsRiotum", - "tezos-accuser-PsQuebec", - "tezos-baker-PsQuebec", "tezos-sapling-params", "tezos-baking" ], diff --git a/flake.lock b/flake.lock index d2534fe9c..9bfa71718 100644 --- a/flake.lock +++ b/flake.lock @@ -1243,11 +1243,11 @@ "opam-repository_2": { "flake": false, "locked": { - "lastModified": 1738066957, - "narHash": "sha256-zUOPhbEsAJprwvanDVDT3DSV1ioUjuGxMVYCYlzfd2E=", + "lastModified": 1749736887, + "narHash": "sha256-hANdEF9/29zan0lWhTfgMlIKgioUMbCjSGEA3/s9KF4=", "owner": "ocaml", "repo": "opam-repository", - "rev": "aa131f3eda80ed7121debe7582faaf50448bc105", + "rev": "a28eb8a148feb4fbc6466fa0791668993513dbde", "type": "github" }, "original": { diff --git a/meta.json b/meta.json index 31c6b3e45..1ff8a6333 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "3", + "release": "1", "maintainer": "Serokell ", - "tezos_ref": "octez-v22.0" + "tezos_ref": "octez-v23.2" } diff --git a/protocols.json b/protocols.json index f20a4d91f..e10ae632b 100644 --- a/protocols.json +++ b/protocols.json @@ -28,10 +28,11 @@ "PtNairob", "Proxford", "PtParisB", - "PsParisC" + "PsParisC", + "PsQuebec" ], "active": [ - "PsQuebec", - "PsRiotum" + "PsRiotum", + "PtSeouLo" ] } diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index a54bc4f31..dffc11e84 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-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-experimental-agnostic-baker" "tezos-node" "tezos-accuser-PsRiotum" "tezos-baker-PsRiotum" "tezos-accuser-PsQuebec" "tezos-baker-PsQuebec") +formulae=("tezos-smart-rollup-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-accuser" "tezos-baker" "tezos-node" "tezos-accuser-PtSeouLo" "tezos-baker-PtSeouLo" "tezos-accuser-PsRiotum" "tezos-baker-PsRiotum") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately.