Skip to content

Commit

Permalink
Merge pull request #697 from serokell/auto/v18.0-rc1-release
Browse files Browse the repository at this point in the history
[Chore] v18.0-rc1 release
  • Loading branch information
krendelhoff2 authored Aug 21, 2023
2 parents ff8b2d3 + 975ae47 commit 9b3b641
Show file tree
Hide file tree
Showing 53 changed files with 1,456 additions and 342 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline-raw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,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-PtMumbai
- nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PtNairob
- rm -rf out
# It takes much time to build binary package, so we do it only on master
branches: "master"
Expand All @@ -141,7 +141,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-PtMumbai
- nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PtNairob
- 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-accuser-PtMumbai, tezos-accuser-PtNairob, tezos-admin-client, tezos-baker-PtMumbai, tezos-baker-PtNairob, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtMumbai, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-node-PtMumbai, tezos-smart-rollup-node-PtNairob]
formula: [tezos-accuser-PtNairob, tezos-accuser-Proxford, tezos-admin-client, tezos-baker-PtNairob, tezos-baker-Proxford, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-client-Proxford, tezos-smart-rollup-node-PtNairob, tezos-smart-rollup-node-Proxford, tezos-dac-client, tezos-dac-node]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# SPDX-FileCopyrightText: 2022 Oxhead Alpha
# SPDX-FileCopyrightText: 2023 Oxhead Alpha
# SPDX-License-Identifier: LicenseRef-MIT-OA

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

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

url "https://gitlab.com/tezos/tezos.git", :tag => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtmumbai.version}/"
sha256 cellar: :any, monterey: "d99450586bb48016307ffdf7d76e7eb0555c31ab1ccde19b3dffd6c36642bcc5"
sha256 cellar: :any, big_sur: "98de4a2dff6201ee2d6435ec8f83a4a943868ec030567809a437a19b1988e9e7"
sha256 cellar: :any, arm64_big_sur: "52c01ff7b363dc1c61426817688fa32946e8bf4f1d3227f24ba1b0aabf6cfa88"
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserProxford.version}/"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand All @@ -62,7 +59,7 @@ def install
set -euo pipefail
accuser="#{bin}/octez-accuser-PtMumbai"
accuser="#{bin}/octez-accuser-Proxford"
accuser_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -77,21 +74,21 @@ def install
exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run
EOS
File.write("tezos-accuser-PtMumbai-start", startup_contents)
bin.install "tezos-accuser-PtMumbai-start"
File.write("tezos-accuser-Proxford-start", startup_contents)
bin.install "tezos-accuser-Proxford-start"
make_deps
install_template "src/proto_016_PtMumbai/bin_accuser/main_accuser_016_PtMumbai.exe",
"_build/default/src/proto_016_PtMumbai/bin_accuser/main_accuser_016_PtMumbai.exe",
"octez-accuser-PtMumbai"
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"
end

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

def post_install
Expand Down
9 changes: 3 additions & 6 deletions Formula/tezos-accuser-PtNairob.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 => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtnairob.version}/"
sha256 cellar: :any, monterey: "8119294feaa1d2df9194f9ac214534ce4b9f0a17939a516c59861ab21b9d15ac"
sha256 cellar: :any, big_sur: "f6b5687d13de47e31f561d897c30137656f2cd873a671cfbf8fd7cc17b406d7a"
sha256 cellar: :any, arm64_big_sur: "3af1de2db0d10370828f5ae6a40576eba9ae0152574b16e70f2b4c3b66effcc5"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand Down
9 changes: 3 additions & 6 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 => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
sha256 cellar: :any, monterey: "ea8d94c9d06ccd9832923e3915e12a1e35256e719b254de89341a1772a80b62b"
sha256 cellar: :any, big_sur: "89b86b6f9ebdec27d9dcff19c6262a0e54f16917b244083f63581d042f1ad57f"
sha256 cellar: :any, arm64_big_sur: "b0a7aebaaf2b6c60a6f1748ab82c2ebe456cb948deda13830f72c18917786bbb"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand Down
33 changes: 15 additions & 18 deletions Formula/tezos-baker-PtMumbai.rb → Formula/tezos-baker-Proxford.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# SPDX-FileCopyrightText: 2022 Oxhead Alpha
# SPDX-FileCopyrightText: 2023 Oxhead Alpha
# SPDX-License-Identifier: LicenseRef-MIT-OA

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

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

url "https://gitlab.com/tezos/tezos.git", :tag => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtmumbai.version}/"
sha256 cellar: :any, monterey: "697990bac2a711f4f535008b6453980882cd7686e6db7f14c3670730535a7197"
sha256 cellar: :any, big_sur: "66facd7620ac17308a96b2cf69888f6de5101577b257b267d2ffd3ccecfb2050"
sha256 cellar: :any, arm64_big_sur: "3ffcfb3985b202a62efd09c8855b4c39e485ad4c7e30da64dd210d54cbdec904"
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerProxford.version}/"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand All @@ -62,7 +59,7 @@ def install
set -euo pipefail
baker="#{bin}/octez-baker-PtMumbai"
baker="#{bin}/octez-baker-Proxford"
baker_config="$TEZOS_CLIENT_DIR/config"
mkdir -p "$TEZOS_CLIENT_DIR"
Expand All @@ -87,21 +84,21 @@ def install
launch_baker "$BAKER_ACCOUNT"
fi
EOS
File.write("tezos-baker-PtMumbai-start", startup_contents)
bin.install "tezos-baker-PtMumbai-start"
File.write("tezos-baker-Proxford-start", startup_contents)
bin.install "tezos-baker-Proxford-start"
make_deps
install_template "src/proto_016_PtMumbai/bin_baker/main_baker_016_PtMumbai.exe",
"_build/default/src/proto_016_PtMumbai/bin_baker/main_baker_016_PtMumbai.exe",
"octez-baker-PtMumbai"
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"
end

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

def post_install
Expand Down
9 changes: 3 additions & 6 deletions Formula/tezos-baker-PtNairob.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 => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtnairob.version}/"
sha256 cellar: :any, monterey: "b0a2b5e165f14b15292f9dc2b8f1ddb3941f94dcce76ef91dd174b883e53674b"
sha256 cellar: :any, big_sur: "536e0645af7de6373c2c0116cffbdd3a510369457fc23b00a0cfcc2452df5203"
sha256 cellar: :any, arm64_big_sur: "4314adb34e9e8f2733b8e9e9d9b9fcfc983f4480d8233a8c66e25adbe819d8cc"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand Down
9 changes: 3 additions & 6 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 => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
sha256 cellar: :any, monterey: "b1a940683048debcc1daf873503d6aa95dab71050a9db003f32435c28c7e9694"
sha256 cellar: :any, big_sur: "61ed45838dc649bd5264e3f1520ca9af5c37e152b07d6255987de7d58e15a325"
sha256 cellar: :any, arm64_big_sur: "8af7c78c67ed61f3d16b3ffd08dc82d4914172ee3eecb8811568d044eb661b9f"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand Down
9 changes: 3 additions & 6 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 => "v17.3", :shallow => false
url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false

version "v17.3-1"
version "v18.0-rc1-1"

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

bottle do
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
sha256 cellar: :any, monterey: "a69309b6ecae9573faea0bd24e86d70d3981430831d81898760a17121f0e0546"
sha256 cellar: :any, big_sur: "e5c3da00b2b0afc9f417112002f6711e3eb5ff273bff1906dca3bfcd7038e4b0"
sha256 cellar: :any, arm64_big_sur: "2b61313c57008a420d9968f6b8713a3a54e1bb700e53cabdf91fa7b529c28c72"
end

def make_deps
Expand All @@ -42,7 +39,7 @@ def make_deps
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.60.0", "-y"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
end
Expand Down
Loading

0 comments on commit 9b3b641

Please sign in to comment.