Skip to content

Commit

Permalink
Merge pull request #807 from serokell/auto/v20.1-release
Browse files Browse the repository at this point in the history
[Chore] v20.1 release
  • Loading branch information
rvem authored Jun 19, 2024
2 parents 4db48cd + c33ee58 commit 9bc332f
Show file tree
Hide file tree
Showing 45 changed files with 139 additions and 155 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline-raw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ steps:
- eval "$SET_VERSION"
# Building all binary packages will take significant amount of time, so we build only one
# in order to ensure package generation sanity
- nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-Proxford
- nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PsParisC
- rm -rf out
# It takes much time to build binary package, so we do it only on master
branches: "master"
Expand Down Expand Up @@ -144,7 +144,7 @@ steps:
- eval "$SET_VERSION"
# Building all binary packages will take significant amount of time, so we build only one
# in order to ensure package generation sanity
- nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-Proxford
- nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PsParisC
- rm -rf out
# It takes much time to build binary package, so we do it only on master
branches: "master"
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-PtParisB, tezos-baker-PtParisB, tezos-accuser-Proxford, tezos-baker-Proxford]
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]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# SPDX-FileCopyrightText: 2023 Oxhead Alpha
# SPDX-FileCopyrightText: 2024 Oxhead Alpha
# SPDX-License-Identifier: LicenseRef-MIT-OA

class TezosAccuserProxford < Formula
class TezosAccuserPsparisc < Formula
@all_bins = []

class << self
attr_accessor :all_bins
end
homepage "https://gitlab.com/tezos/tezos"

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

version "v20.0-2"
version "v20.1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -25,9 +25,7 @@ class << self
desc "Daemon for accusing"

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

def make_deps
Expand Down Expand Up @@ -61,7 +59,7 @@ def install
set -euo pipefail
accuser="#{bin}/octez-accuser-Proxford"
accuser="#{bin}/octez-accuser-PsParisC"
accuser_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -76,21 +74,21 @@ def install
exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run
EOS
File.write("tezos-accuser-Proxford-start", startup_contents)
bin.install "tezos-accuser-Proxford-start"
File.write("tezos-accuser-PsParisC-start", startup_contents)
bin.install "tezos-accuser-PsParisC-start"
make_deps
install_template "src/proto_018_Proxford/bin_accuser/main_accuser_018_Proxford.exe",
"_build/default/src/proto_018_Proxford/bin_accuser/main_accuser_018_Proxford.exe",
"octez-accuser-Proxford"
install_template "src/proto_020_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe",
"_build/default/src/proto_20_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe",
"octez-accuser-PsParisC"
end

service do
run opt_bin/"tezos-accuser-Proxford-start"
run opt_bin/"tezos-accuser-PsParisC-start"
require_root true
environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732"
keep_alive true
log_path var/"log/tezos-accuser-Proxford.log"
error_log_path var/"log/tezos-accuser-Proxford.log"
log_path var/"log/tezos-accuser-PsParisC.log"
error_log_path var/"log/tezos-accuser-PsParisC.log"
end

def post_install
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "e43c960298b35bef54a692c6ca372fd02abd4655073709251653b3f302edcbc0"
sha256 cellar: :any, arm64_monterey: "0539e4c98d9dac4c51bbbff14a547d6d914a26e3c8bb6b87e31274d39da9b996"
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "763571c2b94949472d30555cd87cdb3074e9fd07042dfe9001ea7329783a45d5"
sha256 cellar: :any, arm64_monterey: "346cda859428676b87657820d2e565add4cca9f4499183b4bbd34bef507cadbf"
end

def make_deps
Expand Down
30 changes: 14 additions & 16 deletions Formula/tezos-baker-Proxford.rb → Formula/tezos-baker-PsParisC.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# SPDX-FileCopyrightText: 2023 Oxhead Alpha
# SPDX-FileCopyrightText: 2024 Oxhead Alpha
# SPDX-License-Identifier: LicenseRef-MIT-OA

class TezosBakerProxford < Formula
class TezosBakerPsparisc < Formula
@all_bins = []

class << self
attr_accessor :all_bins
end
homepage "https://gitlab.com/tezos/tezos"

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

version "v20.0-2"
version "v20.1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand All @@ -25,9 +25,7 @@ class << self
desc "Daemon for baking"

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

def make_deps
Expand Down Expand Up @@ -61,7 +59,7 @@ def install
set -euo pipefail
baker="#{bin}/octez-baker-Proxford"
baker="#{bin}/octez-baker-PsParisC"
baker_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -86,21 +84,21 @@ def install
launch_baker "$BAKER_ACCOUNT"
fi
EOS
File.write("tezos-baker-Proxford-start", startup_contents)
bin.install "tezos-baker-Proxford-start"
File.write("tezos-baker-PsParisC-start", startup_contents)
bin.install "tezos-baker-PsParisC-start"
make_deps
install_template "src/proto_018_Proxford/bin_baker/main_baker_018_Proxford.exe",
"_build/default/src/proto_018_Proxford/bin_baker/main_baker_018_Proxford.exe",
"octez-baker-Proxford"
install_template "src/proto_020_PsParisC/bin_baker/main_baker_020_PsParisC.exe",
"_build/default/src/proto_020_PsParisC/bin_baker/main_baker_020_PsParisC.exe",
"octez-baker-PsParisC"
end

service do
run opt_bin/"tezos-baker-Proxford-start"
run opt_bin/"tezos-baker-PsParisC-start"
require_root true
environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", TEZOS_NODE_DIR: "", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732", BAKER_ACCOUNT: ""
keep_alive true
log_path var/"log/tezos-baker-Proxford.log"
error_log_path var/"log/tezos-baker-Proxford.log"
log_path var/"log/tezos-baker-PsParisC.log"
error_log_path var/"log/tezos-baker-PsParisC.log"
end

def post_install
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "7ca1c8b2c23d700707735a955183f9286dbe27ae953690b3092a6f21703ca52f"
sha256 cellar: :any, arm64_monterey: "4465111801a14bdc89e6cad5b62788f150a8f44906b3838151a567e60b438ffd"
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "0745bff5f4e675c50e18555e73664f6de19068cd70804c191a702b6f5c7c6b88"
sha256 cellar: :any, arm64_monterey: "3d7fde1bbf98323886fcc059fc17a05ede1ea270037eaa21eae7706c950358e0"
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "98192e1bb9ea727870887d44b151d898cf6c160515a84094f789188e40bab8a5"
sha256 cellar: :any, arm64_monterey: "cbd1a414b02cb25a6036f553873010a39be7fa56508b42a9840a9bbf9cb47ccc"
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "9f91853e6c26ec1f405acc7cb2883d76f8e928d0911cbff96cffd7979b60d21d"
sha256 cellar: :any, arm64_monterey: "f3151c89911802a415b69a63d3d2cc9bdd530bd8ed235ccdf5920f09b2081de9"
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "b7bf391be6399858bdcd7aef591e07e57ad9373408367f2d1d10e10a4f538f1d"
sha256 cellar: :any, arm64_monterey: "cb4f3efc17cd6ad5ccca722d21e6a75a7a6b51ee3a53ee9e68ac3cdcd838561c"
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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "228aa88775d3384c0266b7ca372fb5bdaf4fa3d0188553f33d4104d1f187027d"
sha256 cellar: :any, arm64_monterey: "c87c12c13516fe198f20e1315596ff3db759987599fac18150f3bb1d44dc362f"
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.0-2"
version "v20.1-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.0-2"
version "v20.1-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.0", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false

version "v20.0-2"
version "v20.1-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: "5fb634d7d5592b3a5b7b8f77f6f729e1b8fcba8218aa9626dd98a4867ebc92b1"
sha256 cellar: :any, arm64_monterey: "015a701f79ce4ef18c1a8883a2aead51b7064628c2b7e53c93a7f0aaa9d6117c"
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.0-2"
version "v20.1-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.0-2"
version "v20.1-1"

depends_on "tezos-signer"

Expand Down
Loading

0 comments on commit 9bc332f

Please sign in to comment.