From 319b276d10a59bfd5c4816bb33c544e3b3776096 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 20 Sep 2023 16:06:32 +0000 Subject: [PATCH 1/5] [Chore] Bump Tezos sources to v18.0 --- flake.lock | 6 +++--- meta.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 9c69b961c..05ed958b4 100644 --- a/flake.lock +++ b/flake.lock @@ -1365,11 +1365,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1692197267, - "narHash": "sha256-DFan2Z2OVwxxK7s2TT+2GI6zy9/NWhVa13D89JjscZg=", + "lastModified": 1695211997, + "narHash": "sha256-tYFW/7xifDUntrtPmF9VnOZAhg57/5oKAnEkc0lRuww=", "owner": "tezos", "repo": "tezos", - "rev": "f59e1b0eaa26e97a23824dc4fbd4af2bd8fcf8af", + "rev": "bcea813c2aa8f0cf812752dbb72c89c055621c0a", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index 793cf5632..7e834dc5f 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "2", "maintainer": "Serokell ", - "tezos_ref": "v18.0-rc1" + "tezos_ref": "v18.0" } From 2687363e756f72790abdd74a054e8f9869773623 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 20 Sep 2023 16:06:32 +0000 Subject: [PATCH 2/5] [Chore] Update brew formulae for v18.0 --- 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-oxfordnet.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-Proxford.rb | 7 ++----- Formula/tezos-smart-rollup-node-PtNairob.rb | 7 ++----- Formula/tezos-smart-rollup-wasm-debugger.rb | 4 ++-- 24 files changed, 40 insertions(+), 85 deletions(-) diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb index 1e2dcb17a..80da5e47c 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "bc0441c5c881287a2fcca74ceb92d98e45d17032fe755f67dec8cce30ac5f53a" - sha256 cellar: :any, big_sur: "7ef8600cabf0fac5da4b6a039d2d64e822fbb647f626ba15c60321a8ba746769" - sha256 cellar: :any, monterey: "18afc3bd1220735856ef95996721867c6c540f29bfbbf4e4c896c09e82357780" end def make_deps diff --git a/Formula/tezos-accuser-PtNairob.rb b/Formula/tezos-accuser-PtNairob.rb index e18baf09e..a3dc28770 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "ee18dd0c95321329f7652dc3933d521ef8c03d419a0bff7483820ea96d224a60" - sha256 cellar: :any, big_sur: "d361befe303c87690952680aa3563984ab3ff7d2bd991158884aa7242c9b78a5" - sha256 cellar: :any, monterey: "e772cfe143b971c10e77fe39414884d224a5557de6ebec9b6cefb90d7ae10a31" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index 7f8e38c80..933670e39 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "002cddcdf4661c88d586efd6e04349c77fc45f2ba47d51259699b576a7368b47" - sha256 cellar: :any, big_sur: "212103ff0b6df15e79a10b2e260b9c0a01988a7a6a01954536951e549bdf4e15" - sha256 cellar: :any, monterey: "6b8598435cfb751c9a7a595c69cc17bddde6a5913486f6aa29a3987acc0b5b29" end def make_deps diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb index 775af8b94..01a957491 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "4130d6fde0bd567595b614fe873d4e279d9c0968038487302e5efb4716654e21" - sha256 cellar: :any, big_sur: "c8ba59f374b1d9f4f9f4740124220e8f7f81d05d6f649571f8f3cd98d4de4340" - sha256 cellar: :any, monterey: "79962f86efe8320920fcdc8ff3a1734ffce83fc1fb74fc6807a770db6fd690af" end def make_deps diff --git a/Formula/tezos-baker-PtNairob.rb b/Formula/tezos-baker-PtNairob.rb index 233dd0dfa..c13415c99 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "7297607bbe2b907a1d1c6b9deb3dc4c160a68162b47fdbbc30ae25b2a4ed04c8" - sha256 cellar: :any, big_sur: "0f06234ad073d83f7a79ae26a1abd6cfd595d0e37b7bdb493afc9c9a6e7ef907" - sha256 cellar: :any, monterey: "3a549bc7a2bd6f106e695913698291474873ce3c7cf9ee7f1496b603472c4460" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 3f663abe4..89735bcd5 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "af41dbe0e2f883def6a847739d1373db81b0764875c1dde1cb9632cacdf61a3a" - sha256 cellar: :any, big_sur: "4053fe7ee229657c58ea5264f3841a9f83d3b3b4adda1f16c40570ee94312383" - sha256 cellar: :any, monterey: "670eff38578026547bbb2a0887c6b41fb10cddcfea1d40138b3d8940248239ee" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index 4d789d224..53b797797 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "c1d84067a64c2445e3f2f0d9b4f030f73b6c653c8dd0db76119700b84d5a171d" - sha256 cellar: :any, big_sur: "c58e0c9ae3a888d72a8fc2a27b13a7bdf25eb1d3db5cfbee4b82d4d0bf2c6131" - sha256 cellar: :any, monterey: "33dcffae438e3897d9e003205ba3ed3e75d3a4cd1e4560844fd1e821d073a7a3" end def make_deps diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb index f4eb1c6b5..c2d4a1f5f 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "11621253b53e75235a8557b6fc5f763b7b4ddb6dd76276221d0ef7d98c9a84ed" - sha256 cellar: :any, big_sur: "285406c3a521f4dc10f3ba2dc7bf5d5d59c1ec622ec4e255135a778222c1ec5e" - sha256 cellar: :any, monterey: "12cf98c63842cca83b34348d7aad09ec908d819707364d2ac909388cd9c84e84" end def make_deps diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb index b134c9e77..c428cc04f 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "e7d00c64f7c523628ba381d0859700a11725405ce35e977bf7d81e49587b7f16" - sha256 cellar: :any, big_sur: "f15d9bd9a5b61e96f4af2a097dac3bc6c531d8229aa729f56163a9bdc1c979e3" - sha256 cellar: :any, monterey: "5ff06281f0f4b62b97b64bd79c79986cd28541a6f426a98df4078ebcd518324a" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index b3972ed00..7d42aa103 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index e9bfb9fd2..a7d1c6b06 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-nairobinet.rb b/Formula/tezos-node-nairobinet.rb index 543a2816f..b71a31e32 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-oxfordnet.rb b/Formula/tezos-node-oxfordnet.rb index 888ad510e..6ba519076 100644 --- a/Formula/tezos-node-oxfordnet.rb +++ b/Formula/tezos-node-oxfordnet.rb @@ -5,7 +5,7 @@ class TezosNodeOxfordnet < Formula url "file:///dev/null" - version "v18.0-rc1-1" + version "v18.0-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 9001d7182..d87ae2de9 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "c71f5657427cd035b82dc6b0a8c820846d9fbc157021f831432482f7f158f2b3" - sha256 cellar: :any, big_sur: "bf8eed699d5df92f702e7cfc27a3e63720076c4b9414c6ca348ae5b6a6521bb3" - sha256 cellar: :any, monterey: "d1e281c0ae9cb1dcca76252345ea0be1dd909f9c5dcb74f20528d80966679698" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index def1526d5..813647924 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 66e630952..010b515b2 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index 3525f1c89..2e4dd27a3 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 5e96e1e60..a0efbad3f 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.0-rc1-1" + version "v18.0-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index 26d3fd134..dd59b5d02 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "4af9252ea4e22eb678f7b3eaad71e343e11b39e3ebb1d015bebf333b8a4a723f" - sha256 cellar: :any, big_sur: "709bd0df4af94e228a975843d69c2825b996233dad55f0be77e9bbf0e4454ad9" - sha256 cellar: :any, monterey: "cd1592983e06de32000694a12fb4380aa58042e18709b8e799580bc724697e22" end def make_deps diff --git a/Formula/tezos-smart-rollup-client-Proxford.rb b/Formula/tezos-smart-rollup-client-Proxford.rb index be3bbd365..eaded5d08 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "e9004b0cb53c5bf1571e6cc32518154853295c4a583535ce3b18cd62f893fcc3" - sha256 cellar: :any, big_sur: "eac7ff33ea326424efb297068014f894e716a72dfb6c06f656a142f090142d34" - sha256 cellar: :any, monterey: "3168234eeb049ddcabb88abcdd0c189bcaef4819b434fb7c729422d88ed1a36c" end def make_deps diff --git a/Formula/tezos-smart-rollup-client-PtNairob.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb index 2256ada1c..b99f522bf 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] 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, arm64_big_sur: "4f6273c00de3610b68666fbeee659b191011679fca9b84d0a6125f32fd05a027" - sha256 cellar: :any, big_sur: "f4f85a8f3df9e28399deca0076be3c15b474e86df1c74ca2470e263818ada225" - sha256 cellar: :any, monterey: "07ce62ba3d2285e30dec4336a8f5a4ad9a1bc38644982b0826252dfc43140eab" end def make_deps diff --git a/Formula/tezos-smart-rollup-node-Proxford.rb b/Formula/tezos-smart-rollup-node-Proxford.rb index d2c69000e..95b47e920 100644 --- a/Formula/tezos-smart-rollup-node-Proxford.rb +++ b/Formula/tezos-smart-rollup-node-Proxford.rb @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -28,9 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodeProxford.version}/" - sha256 cellar: :any, arm64_big_sur: "6e4cb3b4ede45d13f8d558544316fd2b1e9c4f985e02b05ec8863edc1e390757" - sha256 cellar: :any, big_sur: "420467457b304ffc8056212a0ea0627088adb18053e135a876c4890ae0454f3f" - sha256 cellar: :any, monterey: "bbe5f5dff795a63681b3ce0e5fedc47795010c1d021e4dca3e930a853cab01fb" end def make_deps diff --git a/Formula/tezos-smart-rollup-node-PtNairob.rb b/Formula/tezos-smart-rollup-node-PtNairob.rb index 3448e484a..7855c67a8 100644 --- a/Formula/tezos-smart-rollup-node-PtNairob.rb +++ b/Formula/tezos-smart-rollup-node-PtNairob.rb @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -28,9 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodePtnairob.version}/" - sha256 cellar: :any, arm64_big_sur: "0264f3275f3bcd9725ade8d09bc130a10121f946436c52f43263b8137b7cb49c" - sha256 cellar: :any, big_sur: "0be328c657b19fab2e33b4d61a4cd832407a284fe83248149021c789a7e82fe4" - sha256 cellar: :any, monterey: "c3c148d671540495ee290b7fd0d980ffc8619beb6f3d2b5182d14a89709d11af" end def make_deps diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index a834a6426..8519bd19f 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.0-rc1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0", :shallow => false - version "v18.0-rc1-1" + version "v18.0-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| From ddb12ef2362a178f49ec5659f9ff1c53bb63d8ac Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 20 Sep 2023 16:06:32 +0000 Subject: [PATCH 3/5] [Chore] Reset release number for v18.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 fada2bf0d..e85a298a5 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.0-rc1a" +version = "v18.0" [tool.setuptools.packages.find] where= ["src"] diff --git a/meta.json b/meta.json index 7e834dc5f..aef2cd120 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "2", + "release": "1", "maintainer": "Serokell ", "tezos_ref": "v18.0" } From 31873073755589b19bb06fa8cd3f5ec9be2b65c1 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Wed, 20 Sep 2023 16:06:32 +0000 Subject: [PATCH 4/5] [Chore] Reset letter_version for v18.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 6546d040c8646a99a2a0f0e541086cb7178f2257 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Wed, 20 Sep 2023 20:07:30 +0300 Subject: [PATCH 5/5] [Chore] Add hack for `octez-proto-libs` Problem: `octez-protocol-compiler` requires some docs to be present in the `octez-proto-libs`. Solution: Add dummy docs. --- nix/build/hacks.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix index 43434eaf9..acc1d506f 100644 --- a/nix/build/hacks.nix +++ b/nix/build/hacks.nix @@ -3,7 +3,7 @@ # This file needs to become empty. self: super: rec { - # For some reason octez-protocol-compiler wants some docs to be present in octez-libs + # For some reason octez-protocol-compiler wants some docs to be present in octez libs octez-libs = super.octez-libs.overrideAttrs (o: { postFixup = '' DUMMY_DOCS_DIR="$OCAMLFIND_DESTDIR/../doc/${o.pname}" @@ -19,6 +19,21 @@ self: super: rec { done ''; }); + octez-proto-libs = super.octez-proto-libs.overrideAttrs (o: { + postFixup = '' + DUMMY_DOCS_DIR="$OCAMLFIND_DESTDIR/../doc/${o.pname}" + mkdir -p "$DUMMY_DOCS_DIR" + for doc in "README.md" "CHANGES.rst" "LICENSE"; do + touch "$DUMMY_DOCS_DIR/$doc" + done + + DUMMY_ODOC_PAGES_DIR="$DUMMY_DOCS_DIR/odoc-pages" + mkdir -p "$DUMMY_ODOC_PAGES_DIR" + for doc in "tezos_workers.mld" "tezos_lwt_result_stdlib.mld" "index.mld"; do + touch "$DUMMY_ODOC_PAGES_DIR/$doc" + done + ''; + }); octez-admin-client = super.octez-client.overrideAttrs (_ : { name = "octez-admin-client"; postInstall = "rm $out/bin/octez-client $out/bin/*.sh";