Skip to content

Commit

Permalink
Merge pull request #822 from serokell/auto/v20.3-release
Browse files Browse the repository at this point in the history
[Chore] v20.3 release
  • Loading branch information
krendelhoff2 authored Oct 4, 2024
2 parents 118fb4b + 1c7138e commit e35002d
Show file tree
Hide file tree
Showing 31 changed files with 56 additions and 76 deletions.
3 changes: 3 additions & 0 deletions .buildkite/pipeline-raw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ steps:
- buildkite-agent artifact download "out/*~focal_amd64.deb" . --step build-static-deb
- cd tests/systemd
- nix shell ../..#legacyPackages.x86_64-linux.vagrant ../..#legacyPackages.x86_64-linux.curl -c vagrant --packages-directory=../../out up --provider=libvirt
retry:
automatic:
limit: 3

- label: create auto release/pre-release
key: auto-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-bottles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
os: [ { id: macos-12, name: "monterey" } ]
# we don't bottle meta-formulas that contain only services
formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsParisC, tezos-baker-PsParisC, tezos-accuser-PtParisB, tezos-baker-PtParisB]
formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsParisC, tezos-baker-PsParisC, tezos-accuser-PtParisB, tezos-baker-PtParisB, tezos-accuser-Proxford, tezos-baker-Proxford]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-accuser-PsParisC.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsparisc.version}/"
sha256 cellar: :any, monterey: "fa3cf98d6bf540512da8e83b664b63e25b4a2826f06774a562783208205fb845"
sha256 cellar: :any, arm64_monterey: "2e13b0e2019e3e91b398177c72147f91da86c4db63a30f24de6fb99bbcc729e5"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-accuser-PtParisB.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtparisb.version}/"
sha256 cellar: :any, monterey: "fe9529632272e4c3d4a4b576d6231c847124c8d848f0f2fe46d464eb3068dd5d"
sha256 cellar: :any, arm64_monterey: "980ea399a740dae5b77679b10078086699f3f4aa977397956039cee3f8a1d8ee"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-admin-client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
sha256 cellar: :any, monterey: "3355fbf7d668d34a83d963c3807fd06c597342a186568fe82168f99b5c5b070d"
sha256 cellar: :any, arm64_monterey: "509a674fc10c594f1fe262c55a1c5351a787ea4838925e33c2466c8206ebc565"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-baker-PsParisC.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsparisc.version}/"
sha256 cellar: :any, monterey: "41e02c2522a7f79936dcb2f80431799348c8cc3397bf74cd809d059e6ece7a82"
sha256 cellar: :any, arm64_monterey: "4fd69eebb1d2997fe10613df7c337243f3f69f73fdc936070db8c6430b4d247b"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-baker-PtParisB.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtparisb.version}/"
sha256 cellar: :any, monterey: "92bfacca2afe5ca424e6605586c55bd7c620ffe720d299ed45eebf697c729e8b"
sha256 cellar: :any, arm64_monterey: "1c34c1fd010ec6f36100a77326955773892ea242805e5018f74f81225ddfa223"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
sha256 cellar: :any, monterey: "e7251ee961bb826c5eb017dc8886729698d9dac33c1215a3d6521193a4f70f72"
sha256 cellar: :any, arm64_monterey: "9a791b95872234d1912d8c251d6fc770191310de61ca6fa0780cdea3df8f5680"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-codec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
sha256 cellar: :any, monterey: "d81e5d87dfc90f1a99d78341728b70bf538d78f91edb65b1c854faa27d6ec294"
sha256 cellar: :any, arm64_monterey: "96cac33c736ca657a6d89345f286cd6a67ad81ccec2977d75a977d3f40cd35ae"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-dac-client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/"
sha256 cellar: :any, monterey: "cb4d4e09f2f42b63ae72d805a398420e35696e5869e8bd3aac78c8681384f68b"
sha256 cellar: :any, arm64_monterey: "faa78f68a4a1853a81ec1055eda1d783a3af2bfa82c853b469f81ea7b45ed4f5"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-dac-node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/"
sha256 cellar: :any, monterey: "e55b679e40900efafc25e69e8c09b3169c4d46cc4c96b9b167d88a41eef3729f"
sha256 cellar: :any, arm64_monterey: "033d4ae22759f70249395ce67a3a21ebc3ea295f5f6e3e062fa23e17fa216e94"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-dal-node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/"
sha256 cellar: :any, monterey: "ac24e3b9d217154f70434364e04a08def08a2b26ec80c739c2e101e34b5cd371"
sha256 cellar: :any, arm64_monterey: "940fc8b67021ed78e7ab23f6d06fd33665601d9e1837ad4d238a89b6ee91972a"
end

def make_deps
Expand Down
2 changes: 1 addition & 1 deletion Formula/tezos-node-ghostnet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class TezosNodeGhostnet < Formula
url "file:///dev/null"
version "v20.2-1"
version "v20.3-1"

depends_on "tezos-node"

Expand Down
2 changes: 1 addition & 1 deletion Formula/tezos-node-mainnet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class TezosNodeMainnet < Formula
url "file:///dev/null"
version "v20.2-1"
version "v20.3-1"

depends_on "tezos-node"

Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
sha256 cellar: :any, monterey: "cd0ac681e1eb7e0b93d177ecdaf473aa2693e904888c65ff17103c73a160ee72"
sha256 cellar: :any, arm64_monterey: "2e16aaf9b7ececc6e84c11390909ceeb556e7b378bef11998f1e47529c6c1bd8"
end

def make_deps
Expand Down
2 changes: 1 addition & 1 deletion Formula/tezos-signer-http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class TezosSignerHttp < Formula
url "file:///dev/null"
version "v20.2-1"
version "v20.3-1"

depends_on "tezos-signer"

Expand Down
2 changes: 1 addition & 1 deletion Formula/tezos-signer-https.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class TezosSignerHttps < Formula
url "file:///dev/null"
version "v20.2-1"
version "v20.3-1"

depends_on "tezos-signer"

Expand Down
2 changes: 1 addition & 1 deletion Formula/tezos-signer-tcp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class TezosSignerTcp < Formula
url "file:///dev/null"
version "v20.2-1"
version "v20.3-1"

depends_on "tezos-signer"

Expand Down
2 changes: 1 addition & 1 deletion Formula/tezos-signer-unix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class TezosSignerUnix < Formula
url "file:///dev/null"
version "v20.2-1"
version "v20.3-1"

depends_on "tezos-signer"

Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-signer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -26,8 +26,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/"
sha256 cellar: :any, monterey: "ea238c5e54d0a78e09573251934890f5d9705bd51a8858531fa389d86b597333"
sha256 cellar: :any, arm64_monterey: "bb507c59e63c55fa86674a066c7661bc61ddab123d0c3021306fb2e08e03bbdc"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-smart-rollup-node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -28,8 +28,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/"
sha256 cellar: :any, monterey: "8bda0bf45490a478587e7baf1e0c441409e15514aab7de4700912e70a3e0df1a"
sha256 cellar: :any, arm64_monterey: "753c9f0dabfc1400baafd8b178059144357a1bca65c668a6b07076337c3452da"
end

def make_deps
Expand Down
6 changes: 2 additions & 4 deletions Formula/tezos-smart-rollup-wasm-debugger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ class << self
end
homepage "https://gitlab.com/tezos/tezos"

url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.2", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.3", :shallow => false

version "v20.2-1"
version "v20.3-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -27,8 +27,6 @@ class << self

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/"
sha256 cellar: :any, monterey: "b95be6fb96cf65068ab1e2666f613c21ec1c7616fa02de3e4fd28cd8060816d3"
sha256 cellar: :any, arm64_monterey: "bc85091063ba3c57d3c2f96e830c05b632af723e4b3b4126f17a18f6d1147028"
end

def make_deps
Expand Down
2 changes: 1 addition & 1 deletion baking/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "v20.2"
version = "v20.3"

[tool.setuptools.packages.find]
where= ["src"]
Expand Down
8 changes: 4 additions & 4 deletions baking/src/tezos_baking/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ def get_filesize(self, url):
def get_snapshot_metadata(self, network, history_mode, region=None):
region = "eu" if region is None else region
history_mode = "full" if history_mode == "archive" else history_mode
self.metadata_url = (
f"https://snapshots.{region}.tzinit.org/{network}/{history_mode}.json"
)
# FIXME remove or update after pariscnet is down
hacked_network = "parisnet" if network == "pariscnet" else network
self.metadata_url = f"https://snapshots.{region}.tzinit.org/{hacked_network}/{history_mode}.json"
with urllib.request.urlopen(self.metadata_url) as url:
snapshot_metadata = json.load(url)["snapshot_header"]

snapshot_metadata["block_height"] = snapshot_metadata["level"]
snapshot_metadata[
"url"
] = f"https://snapshots.{region}.tzinit.org/{network}/{history_mode}"
] = f"https://snapshots.{region}.tzinit.org/{hacked_network}/{history_mode}"
snapshot_metadata["sha256"] = None
snapshot_metadata["filesize"] = (
"not provided"
Expand Down
Loading

0 comments on commit e35002d

Please sign in to comment.