Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] v21.0-rc3 release #823

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-PtQenaB1, tezos-baker-PtQenaB1, tezos-accuser-PsParisC, tezos-baker-PsParisC]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
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 TezosAccuserPtqenab1 < 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-rc3", :shallow => false

version "v20.3-1"
version "v21.0-rc3-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/#{TezosAccuserPtqenab1.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-PtQenaB1"

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-PtQenaB1-start", startup_contents)
bin.install "tezos-accuser-PtQenaB1-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_PtQenaB1/bin_accuser/main_accuser_021_PtQenaB1.exe",
"_build/default/src/proto_021_PtQenaB1/bin_accuser/main_accuser_021_PtQenaB1.exe",
"octez-accuser-PtQenaB1"
end

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

def post_install
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
27 changes: 13 additions & 14 deletions Formula/tezos-baker-PtParisB.rb → Formula/tezos-baker-PtQenaB1.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 TezosBakerPtqenab1 < 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-rc3", :shallow => false

version "v20.3-1"
version "v21.0-rc3-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/#{TezosBakerPtqenab1.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-PtQenaB1"

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-PtQenaB1-start", startup_contents)
bin.install "tezos-baker-PtQenaB1-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_PtQenaB1/bin_baker/main_baker_021_PtQenaB1.exe",
"_build/default/src/proto_021_PtQenaB1/bin_baker/main_baker_021_PtQenaB1.exe",
"octez-baker-PtQenaB1"
end

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

def post_install
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
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-rc3-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-rc3-1"

depends_on "tezos-node"

Expand Down
4 changes: 2 additions & 2 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-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
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-rc3-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-rc3-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-rc3-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.3-1"
version "v21.0-rc3-1"

depends_on "tezos-signer"

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

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
Expand Down
4 changes: 2 additions & 2 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.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.0-rc3", :shallow => false

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

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
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.3"
version = "v21.0-rc3"

[tool.setuptools.packages.find]
where= ["src"]
Expand Down
1 change: 1 addition & 0 deletions baking/src/tezos_baking/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def pprint_options(self):
"mainnet": "Main Tezos network",
"ghostnet": "Long running test network, currently using the Paris Tezos protocol",
"pariscnet": "Test network using the PsParisC Tezos protocol",
"qenanet": "Test network using the PtQenaB1 Tezos protocol",
}

# Steps
Expand Down
3 changes: 1 addition & 2 deletions docker/active-protocols
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Proxford
PtParisB
PsParisC
PtQenaB1
alpha
Loading