Skip to content

Commit

Permalink
Merge pull request #826 from serokell/auto/v21.0-release
Browse files Browse the repository at this point in the history
[Chore] v21.0 release
  • Loading branch information
DMozhevitin authored Nov 25, 2024
2 parents ee3e41c + ee609d1 commit eb9e07c
Show file tree
Hide file tree
Showing 57 changed files with 458 additions and 245 deletions.
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-exit
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

if [[ "$BUILDKITE_STEP_KEY" == "test-systemd-services" ]]; then
cd tests/systemd
nix shell ../..#legacyPackages.x86_64-linux.vagrant -c vagrant --packages-directory=../../out destroy --force
NIXPKGS_ALLOW_UNFREE=1 nix shell --impure ../..#legacyPackages.x86_64-linux.vagrant -c vagrant --packages-directory=../../out destroy --force
fi
5 changes: 3 additions & 2 deletions .buildkite/pipeline-raw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ steps:
command: nix shell -f https://github.com/serokell/crossref-verifier/archive/68a1f9d25b6e7835fea8299b18a3e6c61dbb2a5c.tar.gz -c crossref-verify
soft_fail: true
- label: lint python code
command: nix shell .#python39Packages.black -c black --check --diff --color .
command: nix shell .#python311Packages.black -c black --check --diff --color .
soft_fail: true
- label: lint bash scripts
command: nix shell .#shellcheck -c shellcheck --shell=bash --exclude=SC1091 -x $(find . -name '*.sh')
- label: pipeline-filtering
Expand Down Expand Up @@ -185,7 +186,7 @@ steps:
commands:
- 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
- NIXPKGS_ALLOW_UNFREE=1 nix shell --impure ../..#legacyPackages.x86_64-linux.vagrant ../..#legacyPackages.x86_64-linux.curl -c vagrant --packages-directory=../../out up --provider=libvirt
retry:
automatic:
limit: 3
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-13, name: "ventura" } ]
# 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, 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-PsQuebec, tezos-baker-PsQuebec, tezos-accuser-PsParisC, tezos-baker-PsParisC]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsparisc.version}/"
sha256 cellar: :any, ventura: "490aa62c6fa8b5502578f677ee4d0e8993212cc59f34546b50a6b787d15986bd"
end

def make_deps
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# SPDX-FileCopyrightText: 2024 Oxhead Alpha
# SPDX-License-Identifier: LicenseRef-MIT-OA

class TezosAccuserPtparisb < Formula
class TezosAccuserPsquebec < 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtparisb.version}/"
sha256 cellar: :any, ventura: "b8f6cb6a21cf2cf703cfdf61cf259414a5c6f7bfa950fc6470ff56c08ff9fe49"
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsquebec.version}/"
end

def make_deps
Expand Down Expand Up @@ -60,7 +59,7 @@ def install
set -euo pipefail
accuser="#{bin}/octez-accuser-PtParisB"
accuser="#{bin}/octez-accuser-PsQuebec"
accuser_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -75,21 +74,21 @@ def install
exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run
EOS
File.write("tezos-accuser-PtParisB-start", startup_contents)
bin.install "tezos-accuser-PtParisB-start"
File.write("tezos-accuser-PsQuebec-start", startup_contents)
bin.install "tezos-accuser-PsQuebec-start"
make_deps
install_template "src/proto_019_PtParisB/bin_accuser/main_accuser_019_PtParisB.exe",
"_build/default/src/proto_019_PtParisB/bin_accuser/main_accuser_019_PtParisB.exe",
"octez-accuser-PtParisB"
install_template "src/proto_021_PsQuebec/bin_accuser/main_accuser_021_PsQuebec.exe",
"_build/default/src/proto_021_PsQuebec/bin_accuser/main_accuser_021_PsQuebec.exe",
"octez-accuser-PsQuebec"
end

service do
run opt_bin/"tezos-accuser-PtParisB-start"
run opt_bin/"tezos-accuser-PsQuebec-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-PtParisB.log"
error_log_path var/"log/tezos-accuser-PtParisB.log"
log_path var/"log/tezos-accuser-PsQuebec.log"
error_log_path var/"log/tezos-accuser-PsQuebec.log"
end

def post_install
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
sha256 cellar: :any, ventura: "5ba0c3cc55109cbafa9462d5371b6fbb62e57d5df14ef8315cfc584e65aa5c07"
end

def make_deps
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsparisc.version}/"
sha256 cellar: :any, ventura: "e8b61dc8a01d2de538c89bb6e020df81e6d64f2ede819a62fe5d0230efbc6b33"
end

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

class TezosBakerPtparisb < Formula
class TezosBakerPsquebec < 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtparisb.version}/"
sha256 cellar: :any, ventura: "8836c1c1d5f4d7e0c8777b953e1a7e0d028ce686a84e1acd402e09420ba09009"
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsquebec.version}/"
end

def make_deps
Expand Down Expand Up @@ -60,7 +59,7 @@ def install
set -euo pipefail
baker="#{bin}/octez-baker-PtParisB"
baker="#{bin}/octez-baker-PsQuebec"
baker_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -85,21 +84,21 @@ def install
launch_baker "$BAKER_ACCOUNT"
fi
EOS
File.write("tezos-baker-PtParisB-start", startup_contents)
bin.install "tezos-baker-PtParisB-start"
File.write("tezos-baker-PsQuebec-start", startup_contents)
bin.install "tezos-baker-PsQuebec-start"
make_deps
install_template "src/proto_019_PtParisB/bin_baker/main_baker_019_PtParisB.exe",
"_build/default/src/proto_019_PtParisB/bin_baker/main_baker_019_PtParisB.exe",
"octez-baker-PtParisB"
install_template "src/proto_021_PsQuebec/bin_baker/main_baker_021_PsQuebec.exe",
"_build/default/src/proto_021_PsQuebec/bin_baker/main_baker_021_PsQuebec.exe",
"octez-baker-PsQuebec"
end

service do
run opt_bin/"tezos-baker-PtParisB-start"
run opt_bin/"tezos-baker-PsQuebec-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-PtParisB.log"
error_log_path var/"log/tezos-baker-PtParisB.log"
log_path var/"log/tezos-baker-PsQuebec.log"
error_log_path var/"log/tezos-baker-PsQuebec.log"
end

def post_install
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
sha256 cellar: :any, ventura: "4efb6f382cecbd3cb51a42f8ec32c94e030212a4339294fb61eff120817b855f"
end

def make_deps
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
sha256 cellar: :any, ventura: "7332ca78fd2aa4f91694629c278a9be92b381e16d89e49e8c5a2d75ea658446e"
end

def make_deps
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/"
sha256 cellar: :any, ventura: "5049f227af507b9e9c1daad5f712b7f557b0034d743952c9f3f0994c2e54541e"
end

def make_deps
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/"
sha256 cellar: :any, ventura: "71efd560049626a0dbb7e0a47d46c8d379d75a0c0eee1d93bf6a0210af267266"
end

def make_deps
Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/"
sha256 cellar: :any, ventura: "28e1064941f25d217c1f782aa814f9cfbde6c8ad0fc914dd7a15ee4ab4c08252"
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.3-1"
version "v21.0-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.3-1"
version "v21.0-1"

depends_on "tezos-node"

Expand Down
5 changes: 2 additions & 3 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0", :shallow => false

version "v20.3-1"
version "v21.0-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
sha256 cellar: :any, ventura: "fb0bac1a458ee6821591e180ec8cf9e54afea1927d43070ee1443cf8f5399304"
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.3-1"
version "v21.0-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.3-1"
version "v21.0-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.3-1"
version "v21.0-1"

depends_on "tezos-signer"

Expand Down
Loading

0 comments on commit eb9e07c

Please sign in to comment.