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] v22.0-rc1 release #838

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
15 changes: 2 additions & 13 deletions .buildkite/pipeline-raw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,6 @@ steps:
- cd tests/bottle-hashes/
- ./test-hash-insert.sh

- label: build via nix
commands:
# NOTE: if this changes, remember to update the instructions in the nix/README.md too
- nix build . -o binaries
branches: "!master"
- label: check flake
commands:
- nix flake check -L
branches: "!master"
# nix builds are usually cached, so we don't care about only_changes setting for it

- label: build-via-docker
# this step is used as a dependency, so we're defining 'key' explicitely
key: build-via-docker
Expand Down Expand Up @@ -117,7 +106,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-PsParisC
- nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PsQuebec
- rm -rf out
# It takes much time to build binary package, so we do it only on master
branches: "master"
Expand Down Expand Up @@ -145,7 +134,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-PsParisC
- nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PsQuebec
- 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-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-PsQuebec, tezos-baker-PsQuebec, tezos-accuser-PsParisC, tezos-baker-PsParisC]
formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-experimental-agnostic-baker, tezos-node, tezos-accuser-PsRiotum, tezos-baker-PsRiotum, tezos-accuser-PsQuebec, tezos-baker-PsQuebec]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
5 changes: 2 additions & 3 deletions Formula/tezos-accuser-PsQuebec.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-v21.4", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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/#{TezosAccuserPsquebec.version}/"
sha256 cellar: :any, ventura: "4fa6c8620561a27ea032d5178d9ab2be90f1df47cc3dccab5015d9e5161833fe"
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 TezosAccuserPsparisc < Formula
class TezosAccuserPsriotum < 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-v21.4", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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/#{TezosAccuserPsparisc.version}/"
sha256 cellar: :any, ventura: "57d5060867fd1d70439f2918aadfe8d64a5ad6d7c75ab5dcdac6a7c7b6dd9072"
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsriotum.version}/"
end

def make_deps
Expand Down Expand Up @@ -62,7 +61,7 @@ def install

set -euo pipefail

accuser="#{bin}/octez-accuser-PsParisC"
accuser="#{bin}/octez-accuser-PsRiotum"

accuser_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -77,21 +76,21 @@ def install

exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run
EOS
File.write("tezos-accuser-PsParisC-start", startup_contents)
bin.install "tezos-accuser-PsParisC-start"
File.write("tezos-accuser-PsRiotum-start", startup_contents)
bin.install "tezos-accuser-PsRiotum-start"
make_deps
install_template "src/proto_020_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe",
"_build/default/src/proto_020_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe",
"octez-accuser-PsParisC"
install_template "src/proto_022_PsRiotum/bin_accuser/main_accuser_022_PsRiotum.exe",
"_build/default/src/proto_022_PsRiotum/bin_accuser/main_accuser_022_PsRiotum.exe",
"octez-accuser-PsRiotum"
end

service do
run opt_bin/"tezos-accuser-PsParisC-start"
run opt_bin/"tezos-accuser-PsRiotum-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-PsParisC.log"
error_log_path var/"log/tezos-accuser-PsParisC.log"
log_path var/"log/tezos-accuser-PsRiotum.log"
error_log_path var/"log/tezos-accuser-PsRiotum.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-v21.4", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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: "aed6d105aaeecabbc13be048ac2fd89f0b464439207ef534b08c5b41fbbeb7e4"
end

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

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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/#{TezosBakerPsquebec.version}/"
sha256 cellar: :any, ventura: "db14683f1a4c940c5b45f18c157cfeb4aa3729eccb0d889dffb198f3b51e1bdf"
end

def make_deps
Expand Down
27 changes: 13 additions & 14 deletions Formula/tezos-baker-PsParisC.rb → Formula/tezos-baker-PsRiotum.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 TezosBakerPsparisc < Formula
class TezosBakerPsriotum < 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-v21.4", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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/#{TezosBakerPsparisc.version}/"
sha256 cellar: :any, ventura: "6b5aa18694d2030ce0cd6c9a68ccc7cc8ef927ace0fdbc2dc3b34241a67a1ea2"
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsriotum.version}/"
end

def make_deps
Expand Down Expand Up @@ -62,7 +61,7 @@ def install

set -euo pipefail

baker="#{bin}/octez-baker-PsParisC"
baker="#{bin}/octez-baker-PsRiotum"

baker_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -87,21 +86,21 @@ def install
launch_baker "$BAKER_ACCOUNT"
fi
EOS
File.write("tezos-baker-PsParisC-start", startup_contents)
bin.install "tezos-baker-PsParisC-start"
File.write("tezos-baker-PsRiotum-start", startup_contents)
bin.install "tezos-baker-PsRiotum-start"
make_deps
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"
install_template "src/proto_022_PsRiotum/bin_baker/main_baker_022_PsRiotum.exe",
"_build/default/src/proto_022_PsRiotum/bin_baker/main_baker_022_PsRiotum.exe",
"octez-baker-PsRiotum"
end

service do
run opt_bin/"tezos-baker-PsParisC-start"
run opt_bin/"tezos-baker-PsRiotum-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-PsParisC.log"
error_log_path var/"log/tezos-baker-PsParisC.log"
log_path var/"log/tezos-baker-PsRiotum.log"
error_log_path var/"log/tezos-baker-PsRiotum.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-v21.4", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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: "66f488d389c28677bda4f2a69c27e4e95095df7b09fb97dc6c99a428b021a9be"
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-v21.4", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false

version "v21.4-1"
version "v22.0-rc1-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup 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: "c2e025c499d79bd5de75411eea65aefc026a135fbad2defa728d37494b990244"
end

def make_deps
Expand Down
64 changes: 0 additions & 64 deletions Formula/tezos-dac-client.rb

This file was deleted.

Loading