author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
603,652
|
21.07.2021 11:55:23
| -10,800
|
ce1098134435f2f5b21a4f72ea0bb46daf952aac
|
Fix ambiguous anchors in the README
Problem: There are some ambiguous anchors that make crossref-verify
unhappy.
Solution: Remove them and use automatically generated anchors instead.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -30,10 +30,10 @@ different networks, you can read more about this in [this article](https://tezos\n* [Getting binaries](#getting-binaries).\n* [Ubuntu](#ubuntu)\n- * [Raspberry Pi OS](#raspberyy)\n+ * [Raspberry Pi OS](#raspberry-pi-os)\n* [Fedora](#fedora)\n- * [Other Linux distros](#linux)\n- * [macOS](#macOS)\n+ * [Other Linux distros](#static-binaries-and-other-linux-distros)\n+ * [macOS](#macos)\n* [Setting up a node and/or baking on Ubuntu](#baking-on-ubuntu).\n* [Building instructions](#building).\n* [Contribution](#contribution).\n@@ -44,22 +44,18 @@ different networks, you can read more about this in [this article](https://tezos\nThe following distributions are supported by the `tezos-packaging`:\n-<a name=\"ubuntu\"></a>\n### [Ubuntu](./docs/distros/ubuntu.md)\nNative Ubuntu packages that can be installed with `apt-get` from a PPA.\n-<a name=\"raspberry\"></a>\n### [Raspberry Pi OS](./docs/distros/ubuntu.md#raspberry)\n-Some Raspverry systems also support packages that can be installed using `apt-get`.\n+Some Raspberry systems also support packages that can be installed using `apt-get`.\n-<a name=\"fedora\"></a>\n### [Fedora](./docs/distros/fedora.md)\nNative Fedora packages that can be installed using using `dnf` or `yum`.\n-<a name=\"linux\"></a>\n### [Static binaries and other linux distros](https://github.com/serokell/tezos-packaging/releases/latest)\nPrebuilt static binaries can be downloaded directly from the [latest release](https://github.com/serokell/tezos-packaging/releases/latest).\n@@ -67,7 +63,6 @@ Prebuilt static binaries can be downloaded directly from the [latest release](ht\nYou can also use `systemd` services for running some of the Tezos binaries in the background.\nFor more information about these services, refer to [this doc](./docs/systemd.md#generic-linux).\n-<a name=\"macos\"></a>\n### [macOS](./docs/distros/macos.md)\n`brew` formulae and taps for stable releases and release candidates.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#251] Fix ambiguous anchors in the README
Problem: There are some ambiguous anchors that make crossref-verify
unhappy.
Solution: Remove them and use automatically generated anchors instead.
|
603,658
|
23.07.2021 14:35:35
| -10,800
|
294e183d4fd1300ed737e466e78570640841ff6e
|
Bump source versions
Problem: Tezos announced a new release candidate. Revisions used
have to be bumped.
Solution: updated versions for Tezos sources and opam-repository.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": \"https://opam.ocaml.org\",\n\"owner\": \"ocaml\",\n\"repo\": \"opam-repository\",\n- \"rev\": \"364a3dc92d821c5de168ef561a9f2a79860cfafc\",\n- \"sha256\": \"0qycjh2f75afnvclmi1vk69zlh6vz1sqcfrkrgf75q8yhvmj0cyx\",\n+ \"rev\": \"b00f227232fdbef981829b0aec1c4ea324ca853b\",\n+ \"sha256\": \"16nvgd3my5xg60qfppfnnxhimjyqczkg6hqh4gl5qnij5m7g1cbq\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/364a3dc92d821c5de168ef561a9f2a79860cfafc.tar.gz\",\n+ \"url\": \"https://github.com/ocaml/opam-repository/archive/b00f227232fdbef981829b0aec1c4ea324ca853b.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"serokell-nix\": {\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v9.4\",\n+ \"ref\": \"refs/tags/v10.0-rc2\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"706457dc9588860fe8d3f1eb0ad7e463a5eba025\",\n+ \"rev\": \"d29e63d8e90a02d331ce96c23c96a6e324370b5b\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump source versions
Problem: Tezos announced a new release candidate. Revisions used
have to be bumped.
Solution: updated versions for Tezos sources and opam-repository.
|
603,658
|
27.07.2021 00:52:52
| -10,800
|
fe7c7ace70ec7b89657e10b3ee2a54c4899408ac
|
Add bottle hashes for v10.0-rc2
Problem: v10.0-rc2 bottles have been built and added to the latest
release, but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"new_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser009Psfloren.version}/\"\n+ sha256 cellar: :any, mojave: \"a7cfc73f78a6109e766009352bb5211be43eab5a30732bb056fcf39f70786770\"\n+ sha256 cellar: :any, catalina: \"728ba08bdffdf9b26fff322eb1beaec16708c122aa97d2cfec3b6e2e89c04a58\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"7987efc4723795bbd907ae5170bef5355255dbbf6b0085814f62955b864f2e78\"\n+ sha256 cellar: :any, catalina: \"38bc18b2f693059a3890295829af56406cb08cd6d5a1f40ba795bdb17e720716\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n+ sha256 cellar: :any, mojave: \"43de6befe483a49c855678ce35f3e03683bca125e9f91a2d49064c26548262be\"\n+ sha256 cellar: :any, catalina: \"70e0b0f87559aa41d3f0bad72bbeb82152a9463a2c8a883f1f08ce89e969c6e0\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-009-PsFLoren.rb",
"new_path": "Formula/tezos-baker-009-PsFLoren.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker009Psfloren.version}/\"\n+ sha256 cellar: :any, mojave: \"01ec537b88dc8082e186f6871bfb11c00179f4eb40a8cc99098eb0261c78ee74\"\n+ sha256 cellar: :any, catalina: \"3082842c81781bb713621a00f4d46881db8805c5779d5643f3367bd4cf1e5879\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"50d602d8a9fc92999b3cafde96518bab1ca630f990b4177109256d8333bacfd6\"\n+ sha256 cellar: :any, catalina: \"58ba515aee47a89c60a5bd7b80983123b2f7322c22cf86ffd60c02b5e34463b2\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n+ sha256 cellar: :any, mojave: \"478035d419a5b88bda5f0f256b6b3e3db0929c9ac1be176cedd9b482b2b27188\"\n+ sha256 cellar: :any, catalina: \"b26b668edc13666880e1747d580cf7af4a6ef04c712a7612e54dcb320e00580a\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n+ sha256 cellar: :any, mojave: \"c19ff42486cfe9c136d1e12177fee7980f1f01b7f630761a56ab7017f918853e\"\n+ sha256 cellar: :any, catalina: \"51b647c8c8928913fa1049ed47a19767e359b56319bcc9e8bc30f8e059a6d12d\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"new_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser009Psfloren.version}/\"\n+ sha256 cellar: :any, mojave: \"b0d6718b7c7ebd8243e73628a99b021e3638ebdbc8446f4cd2f4f15e2039ff06\"\n+ sha256 cellar: :any, catalina: \"26ccdcdfbb6f1005fa00f645ac7ee7d83966e9b468efe5e3b26d373729111a70\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"8112cc92155632c899286c60a6a2aa85b584eb51eb1d6f9f3f284f01b7504c3d\"\n+ sha256 cellar: :any, catalina: \"2b5e22fd905c976739c1626a33489d4ac514cb1dda49a02b4b244b425c2fb549\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n+ sha256 cellar: :any, mojave: \"e0a7a17c90a419396d112793070e40cde643cff868d23fca6b0683bba1016dea\"\n+ sha256 cellar: :any, catalina: \"991679f68e1da46960f75a52171b37816f50de06aeebdc335482719cde300b63\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n+ sha256 cellar: :any, mojave: \"8edec0ee1bd3b16c8d95fdfdf0562dd4bf886d7362100368590841a48de7435e\"\n+ sha256 cellar: :any, catalina: \"fb01dfab1217c24bc3d062169c416dee6ca5e964457e1e623da5655097f4b640\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n+ sha256 cellar: :any, mojave: \"fd53290ad7ca9c4b6b548c99c8dfcad4ad32c2464e3745121fe127189f4cdea8\"\n+ sha256 cellar: :any, catalina: \"5ecbdc871b6695909177aaed9eee1aac87fdd8944326cd74d64fec260ba0f960\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add bottle hashes for v10.0-rc2
Problem: v10.0-rc2 bottles have been built and added to the latest
release, but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
603,652
|
27.07.2021 15:54:59
| -10,800
|
e8dce73801a57dfc19dbaba33942801a7f81e6c7
|
Use stable opam-nix
Problem: PR in opam-nix was finally merged and now we can use its stable
version.
Solution: Use stable version of opam-nix from master branch.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-nix\": {\n- \"branch\": \"rvem/optional-test-deps\",\n+ \"branch\": \"master\",\n\"description\": \"A handy nix library to package OCaml software from OPAM repositories\",\n\"homepage\": null,\n- \"owner\": \"balsoft\",\n+ \"owner\": \"serokell\",\n\"repo\": \"opam-nix\",\n- \"rev\": \"22dda0bb9661a7a1150f14f3ada497ddb4d8acdd\",\n- \"sha256\": \"02nj1fmggl0amrsn19r5dbnmm0amzbdyx0h1gd6czfbhfxb2acfw\",\n+ \"rev\": \"bdd7e6730bdf0ea91ada3ebc68387424b087c9f8\",\n+ \"sha256\": \"1wda717d6391vbgrp0vcv27pxfj4xy1511mssky8ll3iy7i851hn\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/balsoft/opam-nix/archive/22dda0bb9661a7a1150f14f3ada497ddb4d8acdd.tar.gz\",\n+ \"url\": \"https://github.com/serokell/opam-nix/archive/bdd7e6730bdf0ea91ada3ebc68387424b087c9f8.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-repository\": {\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Use stable opam-nix
Problem: PR in opam-nix was finally merged and now we can use its stable
version.
Solution: Use stable version of opam-nix from master branch.
|
603,650
|
27.07.2021 14:39:45
| -7,200
|
6e2ad7f9dc967a7ead9c3511c0d77d19f5b5bc3a
|
Rename "Getting Tezos Binaries" section of the README
Problem: The "Getting Tezos Binaries" section of the README is
a bit misnamed: instructions in there are for several installation
methods, not to be confused with static binaries (that is only one
of them).
Solution: Rename the section to "Installing Tezos".
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -28,7 +28,7 @@ different networks, you can read more about this in [this article](https://tezos\n## Table of contents\n-* [Getting binaries](#getting-binaries).\n+* [Installing Tezos](#installing-tezos).\n* [Ubuntu](#ubuntu)\n* [Raspberry Pi OS](#raspberry-pi-os)\n* [Fedora](#fedora)\n@@ -39,8 +39,7 @@ different networks, you can read more about this in [this article](https://tezos\n* [Contribution](#contribution).\n* [About Serokell](#about)\n-<a name=\"getting-binaries\"></a>\n-## Getting Tezos binaries\n+## Installing Tezos\nThe following distributions are supported by the `tezos-packaging`:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#251] Rename "Getting Tezos Binaries" section of the README
Problem: The "Getting Tezos Binaries" section of the README is
a bit misnamed: instructions in there are for several installation
methods, not to be confused with static binaries (that is only one
of them).
Solution: Rename the section to "Installing Tezos".
|
603,658
|
28.07.2021 17:46:19
| -10,800
|
af8104c2e289ada17e8030a6e85c0bcdf981079b
|
Add granada to the list of mainnet protocols
Problem: granada will be activated on mainnet very soon. We need
to support an automatic switchover.
Solution: added 010-PtGRANAD to the list of mainnet protocols.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -15,7 +15,7 @@ from .systemd import Service, ServiceFile, SystemdUnit, Unit, Install\nnetworks = [\"mainnet\", \"florencenet\", \"granadanet\"]\nnetworks_protos = {\n- \"mainnet\": [\"009-PsFLoren\"],\n+ \"mainnet\": [\"009-PsFLoren\", \"010-PtGRANAD\"],\n\"florencenet\": [\"009-PsFLoren\"],\n\"granadanet\": [\"010-PtGRANAD\"],\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add granada to the list of mainnet protocols
Problem: granada will be activated on mainnet very soon. We need
to support an automatic switchover.
Solution: added 010-PtGRANAD to the list of mainnet protocols.
|
603,658
|
28.07.2021 17:52:45
| -10,800
|
d79ea6c8a7d7ad8b223c1858b699337ac7a27c7a
|
Updated the package versions
Problem: we need to make a new native release to account for
granada activation.
Solution: bumped the release number and the letter version of
tezos-baking
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -451,7 +451,7 @@ class TezosBakingServicesPackage(AbstractPackage):\n# native releases, so we append an extra letter to the version of\n# the package.\n# This should be reset to \"\" whenever the native version is bumped.\n- letter_version = \"a\"\n+ letter_version = \"b\"\ndef __init__(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "meta.json",
"new_path": "meta.json",
"diff": "{\n- \"release\": \"1\",\n+ \"release\": \"2\",\n\"maintainer\": \"Serokell <hi@serokell.io>\"\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Updated the package versions
Problem: we need to make a new native release to account for
granada activation.
Solution: bumped the release number and the letter version of
tezos-baking
|
603,652
|
29.07.2021 12:32:24
| -10,800
|
7ce9724345f6fe2376a59cc554cec863a7a97890
|
Bump Tezos sources
Problem: Octez had a new 9.5 release.
Solution: Update version of the used sources.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v10.0-rc2\",\n+ \"ref\": \"refs/tags/v9.5\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"d29e63d8e90a02d331ce96c23c96a6e324370b5b\",\n+ \"rev\": \"568ffb084a0e81af8bb819e19e8fbaadf63cd8df\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump Tezos sources
Problem: Octez had a new 9.5 release.
Solution: Update version of the used sources.
|
603,652
|
29.07.2021 14:46:19
| -10,800
|
a5d11120a2a3d1816fab6fbfb19bce3d5d3acf39
|
Don't use opam from brew
Problem: opam in brew repository was updated to 2.1.0, however, Octez
requires opam 2.0.*, and now formulas builds fail.
Solution: Use binary from the opam github release instead of using opam
brew dependency.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"new_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosAccuser009Psfloren < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosAccuser009Psfloren < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosAccuser010Ptgranad < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosAccuser010Ptgranad < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosAdminClient < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosAdminClient < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-009-PsFLoren.rb",
"new_path": "Formula/tezos-baker-009-PsFLoren.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosBaker009Psfloren < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosBaker009Psfloren < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosBaker010Ptgranad < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosBaker010Ptgranad < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosClient < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosClient < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosCodec < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosCodec < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"new_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosEndorser009Psfloren < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -33,6 +33,10 @@ class TezosEndorser009Psfloren < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosEndorser010Ptgranad < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -33,6 +33,10 @@ class TezosEndorser010Ptgranad < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosNode < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosNode < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosSandbox < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosSandbox < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -14,7 +14,7 @@ class TezosSigner < Formula\nversion \"v9.5-1\"\n- build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\ndepends_on dependency => :build\nend\n@@ -32,6 +32,10 @@ class TezosSigner < Formula\ndef make_deps\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Don't use opam from brew
Problem: opam in brew repository was updated to 2.1.0, however, Octez
requires opam 2.0.*, and now formulas builds fail.
Solution: Use binary from the opam github release instead of using opam
brew dependency.
|
603,652
|
03.08.2021 10:17:53
| -10,800
|
f9c216fbec0ecc73880a1d5bc8004de414e80c3a
|
Add bottles hashes for v9.5
Problem: Bottles for v9.5 was built and added to the latest release, but
formulae lack their hashes.
Solution: Add hashes for Mojave and Catalina bottles to them.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"new_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser009Psfloren.version}/\"\n+ sha256 cellar: :any, mojave: \"2e08dcff04997a400820216948958b3694e7aa5ef30e5b5647d23bd0b0c39f43\"\n+ sha256 cellar: :any, catalina: \"35ce88b816ef36504270db24596c166d76510a99346f223a5564aa3e8e219fd3\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"c9f404944ec31ce477b0a7b99d5177f4708eae065e49dbe3941f7560f41f42f5\"\n+ sha256 cellar: :any, catalina: \"1794eb62fdbf16d5b3f32552f262ff3bf7c518677e52b837388063c52db5daa2\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n+ sha256 cellar: :any, mojave: \"d434bee13221dfcc0b85330d25a3cb91a12842a8e7435b174e101c4c6143e726\"\n+ sha256 cellar: :any, catalina: \"c07960b53249f7dece49247bc700752d5765e80fa908994049d2cac22b83addc\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-009-PsFLoren.rb",
"new_path": "Formula/tezos-baker-009-PsFLoren.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker009Psfloren.version}/\"\n+ sha256 cellar: :any, mojave: \"c061a18b97913954910797b92dc622c89d14ac13a50dc3f806a8d3b2b07ca737\"\n+ sha256 cellar: :any, catalina: \"438f181dda7e8519b71673ee916cc1381f2a5cfcc054d587b8910bd3a4da2805\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"53fa0ba24752bbfa4c824143cb90cf05609eff11af116d4dc6b0ccd63b92572e\"\n+ sha256 cellar: :any, catalina: \"7bdfb2e9deaad76d8ce18aa6d9f7d9c19309fd15aa4a6fc985ca052d128dc327\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n+ sha256 cellar: :any, mojave: \"696797b23a5dbf3473c41c3820d477638b116864fa90e145db4cd2dbb13fef78\"\n+ sha256 cellar: :any, catalina: \"5b3d5bbe2615bc249706bd49a3fc22eee9b82047a5f6f6b1264bd9ce8ef575d0\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n+ sha256 cellar: :any, mojave: \"4f9c9024e9d8e9eb766ef886c1af07c0fc4bbd696f58774670e8eef70a9868e9\"\n+ sha256 cellar: :any, catalina: \"2c869a759e3972b4c5a47adf98e926773b9dc55d7aa03583908be90ada0ab7dd\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"new_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser009Psfloren.version}/\"\n+ sha256 cellar: :any, mojave: \"ab6928913c0664f6851b1107d6e54bdbf04d728b584bb3caab730eba5ebe46c2\"\n+ sha256 cellar: :any, catalina: \"27dc146e3d5aee49a42787d92b50f13ed4cef23a4c4017ac234e32b522970f89\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"3814b110429d89257d7d44cfa8e1f24e9c8feb1fb1f4f41177e9ce8f138ce528\"\n+ sha256 cellar: :any, catalina: \"b77f4c628aca357faf95081a33714eaf3282d558af8daba91e9a9408bdb7145e\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n+ sha256 cellar: :any, mojave: \"a7ae4987b50f0e68578e951d39ac44054988b396d5d063573157abd7cf8a459e\"\n+ sha256 cellar: :any, catalina: \"d8cabacf9e64328f88d520d973429063ccdd17aa97b091969ef21d3df302af59\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n+ sha256 cellar: :any, mojave: \"62888b23d111b3d7ec4f181684f31e87a074ef17eb332266ff7cf4a28dc2a8ea\"\n+ sha256 cellar: :any, catalina: \"9c7bcc58c252c0aa4f2ffd374508e99087acadc97e08c82fe433be9aa5d0205c\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n+ sha256 cellar: :any, mojave: \"a91d5a33d657267a4bbe00405a323cd3eedac712e8d804ee0d6e1862f62ad9d8\"\n+ sha256 cellar: :any, catalina: \"7abcac7bd53591b11a7134edbab68ffa3355cb81b8e75e7b7a1b236482ab41b4\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add bottles hashes for v9.5
Problem: Bottles for v9.5 was built and added to the latest release, but
formulae lack their hashes.
Solution: Add hashes for Mojave and Catalina bottles to them.
|
603,652
|
03.08.2021 10:00:07
| -10,800
|
ed03a07736743d1de451fa7770d0b8af882ee052
|
Change suggested keyserver for checking
Problem: seems to be dead. As a result users
cannot import the key and check releases artifacts.
Solution: Push key to a bunch of key servers and point to a working one
in the release message.
|
[
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "@@ -13,7 +13,7 @@ let\nAll the other binaries target x86_64.\nRelease artifacts are signed with the following key: 0x7EAF9B150ACE940CF8C008A0BF847A85AC7BF43E.\n- You can check it on http://keys.gnupg.net/.\n+ You can check it on http://keyserver.ubuntu.com/.\nDescriptions for binaries included in this release:\n${builtins.concatStringsSep \"\\n\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#267] Change suggested keyserver for checking
Problem: http://keys.gnupg.net/ seems to be dead. As a result users
cannot import the key and check releases artifacts.
Solution: Push key to a bunch of key servers and point to a working one
in the release message.
|
603,650
|
07.08.2021 22:09:46
| -7,200
|
6cd292549dd83eabda3b1cbc6617ca635d1fb446
|
Update Tezos sources
Problem: yet another Tezos version was released.
We need to bump the revisions used.
Solution: updated versions for Tezos sources.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v9.6\",\n+ \"ref\": \"refs/tags/v9.7\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"af8891d9a11fe9e96dd4e0d6a54f095ca4d6f23b\",\n+ \"rev\": \"853629c2c4db0003b073cce0dddbfb69e73d3275\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update Tezos sources
Problem: yet another Tezos version was released.
We need to bump the revisions used.
Solution: updated versions for Tezos sources.
|
603,658
|
10.08.2021 12:51:00
| -10,800
|
9e6d5019fabb88ffd681b5ef38b71fafab7684b9
|
Add brew bottle hashes for v9.7
Problem: v9.7 bottles have been built and added to the latest
release, but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"new_path": "Formula/tezos-accuser-009-PsFLoren.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser009Psfloren.version}/\"\n+ sha256 cellar: :any, catalina: \"4c425010a18cd5c5d2d9b2a2ca7676ec16c0599bfd02d14e3117e3930427ad59\"\n+ sha256 cellar: :any, mojave: \"eeccf2cc71af74d19aefb313f709656ae1a629fe8987454cc4acf3e61a70e197\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n+ sha256 cellar: :any, catalina: \"42cc54452e56f4deffa9cec77878c83917fec4b7ccc5f30f2499083892500983\"\n+ sha256 cellar: :any, mojave: \"a0b231e140fe5593a005888d9218abbbd96e7e6f1dc409d6238b686d3e9420ea\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n+ sha256 cellar: :any, catalina: \"153a87b42e3c317d709ccb09952eb53097efcb2fcb7d9e7764601822db8b709e\"\n+ sha256 cellar: :any, mojave: \"face98241d6ac1548671f6762585ca2c4e596b3b46d027eed8b720f46b97edff\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-009-PsFLoren.rb",
"new_path": "Formula/tezos-baker-009-PsFLoren.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker009Psfloren.version}/\"\n+ sha256 cellar: :any, catalina: \"4a0e0f0f28995b4423b2dfcd3cb503522572796cc4af4205449c2eb578886764\"\n+ sha256 cellar: :any, mojave: \"4e67a731854ebb0353b7fc1bc049851a7734c28bf5aff854b3c266490b763c00\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n+ sha256 cellar: :any, catalina: \"3e940115120ae7d693a89b07622d8ae370d0aeedc92560931081ab3db2ef0dfa\"\n+ sha256 cellar: :any, mojave: \"3896bd4c1339fffbd59b9a498fc58cd942a60f22a802e3b4bc3d1c467a80976d\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n+ sha256 cellar: :any, catalina: \"b8a22c9f820dc9f7fd6a16699664bf0a0b85f04fac451a8af5a4d77e4d6ca2ac\"\n+ sha256 cellar: :any, mojave: \"4db24bdc238e821fd21b1e62de26e1df66db14e78acd5a69db373da7c57f0c29\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n+ sha256 cellar: :any, catalina: \"f751d216fdc780dbc1efc86616958dbed979f65e5ff50af694e737bfb18bd8c8\"\n+ sha256 cellar: :any, mojave: \"ab908e2b28e574ebff76d3f44907ec0c0107b9141c4082db547ee0dec42b8e1a\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"new_path": "Formula/tezos-endorser-009-PsFLoren.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser009Psfloren < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser009Psfloren.version}/\"\n+ sha256 cellar: :any, catalina: \"194dc41998cd5fc7b3fd38b2b4c2d7b8740de53846abcbc8078a8f6466419997\"\n+ sha256 cellar: :any, mojave: \"ec2a569b632e3d29faee81e02dfd7c6b5f4a0bc132e5247ea922db74d193a587\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n+ sha256 cellar: :any, catalina: \"d154834be47a198dd7e97c2a4240495f0be162e202c706cf0e7bed085e2f8a01\"\n+ sha256 cellar: :any, mojave: \"b57e18413dcc010e2a4c1a51b21db0c31918e4c7a39749691f9ef2150c2d3b8c\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n+ sha256 cellar: :any, catalina: \"4c5e6f1539d5722a33bff40c0554604d7c15740d532085ea1758327de7a60b79\"\n+ sha256 cellar: :any, mojave: \"70fa0dfbb1b9d3f2fd16b246220952ed09c36056f679218a97dc925b24eab5a5\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n+ sha256 cellar: :any, catalina: \"721dc3c0e44b2620746fdfa465c9db639736f2284d68fb0ab6afabef606895da\"\n+ sha256 cellar: :any, mojave: \"19264d5a79356934d2c5b5463dfb04386e89a7e5f999c12a5a5c877d92816188\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n+ sha256 cellar: :any, catalina: \"e399b8b774d72a0ce2ff42a8e5831c9b587a21de8e246c4805223cf22f6553eb\"\n+ sha256 cellar: :any, mojave: \"fd48ee35d9deb08fa72b86486715799dfdccecdd34358fbae963162588a2a4e6\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add brew bottle hashes for v9.7
Problem: v9.7 bottles have been built and added to the latest
release, but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
603,664
|
26.07.2021 16:07:35
| -10,800
|
095caff7f98dfdfe4b2ab42e8c5ae86b51974f51
|
Use Github Actions for checking and building homebrew bottles
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-raw.yml",
"new_path": ".buildkite/pipeline-raw.yml",
"diff": "@@ -70,18 +70,6 @@ steps:\nqueue: \"arm64-build\"\nonly_changes: *static_binaries_changes_regexes\n- - label: check brew formulas\n- commands:\n- # Check all formulas except 'tezos.rb' because it's a base class for all other formulas\n- - find ./Formula -type f -name \"*.rb\" -exec ruby -c {} +\n- # All formulas share the same source URL inherited by the Tezos class, so it's fine\n- # to fetch sources for only one formula\n- - brew fetch -s ./Formula/tezos-client.rb\n- agents:\n- queue: \"x86_64-darwin\"\n- only_changes:\n- - Formula/.*.rb\n-\n- label: test nixos modules\ncommands:\n- nix-build tests/tezos-modules.nix --no-out-link\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/workflows/build-bottles.yml",
"diff": "+name: Build homebrew bottles\n+on:\n+ # Run when a release is tagged\n+ push:\n+ tags:\n+ - \"v*\"\n+jobs:\n+ build-bottles:\n+ runs-on: macos-10.15\n+ steps:\n+ - name: Checkout\n+ uses: actions/checkout@v2\n+\n+ - name: Build bottles\n+ run: ./scripts/build-bottles.sh\n+\n+ - name: Upload bottles to Github Actions\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: homebrew-bottles\n+ path: '*.bottle.*'\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/workflows/check-formulas.yml",
"diff": "+name: Check homebrew formulas\n+on:\n+ # Run on any push which changes related files\n+ push:\n+ paths:\n+ - 'Formula/*.rb'\n+ - '.github/workflows/check-formulas.yml'\n+jobs:\n+ check-formulas:\n+ runs-on: macos-10.15\n+ steps:\n+ - name: Checkout\n+ uses: actions/checkout@v2\n+\n+ - name: Check formula syntax\n+ run: ruby -c ./Formula/*.rb\n+\n+ - name: Check formula source\n+ # All formulas share the same source URL, so it's fine to fetch sources\n+ # for only one formula\n+ run: brew fetch --formula -s ./Formula/tezos-client.rb\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Use Github Actions for checking and building homebrew bottles
|
603,658
|
14.08.2021 14:48:27
| -10,800
|
27c53002ddc3ced890860251d8f86cd9858d3a03
|
Fix opam-repository revision
Problem: the wrong revision together with the wrong hashsum for it
has been used for our v9.7 release. This causes multiple CIs to fail.
Solution: use an older revision with its correct sha256.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": \"https://opam.ocaml.org\",\n\"owner\": \"ocaml\",\n\"repo\": \"opam-repository\",\n- \"rev\": \"d2b022bcd8e39f765da6df49a005a3bb88246097\",\n+ \"rev\": \"5cf7fff7b9a7bda3695954b06c0c7ff58c5e2a05\",\n\"sha256\": \"1rs30hqml5sx0j0v2w39r705lacyvb9nhn55fknmvhn18bj3vz9w\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/d2b022bcd8e39f765da6df49a005a3bb88246097.tar.gz\",\n+ \"url\": \"https://github.com/ocaml/opam-repository/archive/5cf7fff7b9a7bda3695954b06c0c7ff58c5e2a05.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"serokell-nix\": {\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix opam-repository revision
Problem: the wrong revision together with the wrong hashsum for it
has been used for our v9.7 release. This causes multiple CIs to fail.
Solution: use an older revision with its correct sha256.
|
603,658
|
12.08.2021 14:32:58
| -10,800
|
6266ebbec1152655641840ddcae910e68286b99d
|
Bump source versions for v10.0-rc3
Problem: Tezos announced a new release candidate. Revisions used
have to be bumped.
Solution: updated versions for Tezos sources and opam-repository,
as well as the nixpkgs revision.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": \"\",\n\"owner\": \"NixOS\",\n\"repo\": \"nixpkgs\",\n- \"rev\": \"fcab19deb78fbb5ea24e19b133cf34358176396a\",\n- \"sha256\": \"1x78z784sqrkhjx82ca9zchsxhwyyx60yb7wx8gji48nrbw36ijq\",\n+ \"rev\": \"5d73f669a84b5271ae0993244b389411794a1a47\",\n+ \"sha256\": \"0bbmdfgg1x6k5wzvx4371mv0f29xlhl4vng0rpap3jlwf7qlcwf9\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/NixOS/nixpkgs/archive/fcab19deb78fbb5ea24e19b133cf34358176396a.tar.gz\",\n+ \"url\": \"https://github.com/NixOS/nixpkgs/archive/5d73f669a84b5271ae0993244b389411794a1a47.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-nix\": {\n\"homepage\": \"https://opam.ocaml.org\",\n\"owner\": \"ocaml\",\n\"repo\": \"opam-repository\",\n- \"rev\": \"5cf7fff7b9a7bda3695954b06c0c7ff58c5e2a05\",\n- \"sha256\": \"1rs30hqml5sx0j0v2w39r705lacyvb9nhn55fknmvhn18bj3vz9w\",\n+ \"rev\": \"aad0f94dee43a430df1f6844690ab429ab089a3c\",\n+ \"sha256\": \"1ixpxjwigjs731kf1g206mjadshzwxkbnfd234p1yykrlmzpb4zy\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/5cf7fff7b9a7bda3695954b06c0c7ff58c5e2a05.tar.gz\",\n+ \"url\": \"https://github.com/ocaml/opam-repository/archive/aad0f94dee43a430df1f6844690ab429ab089a3c.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"serokell-nix\": {\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v9.7\",\n+ \"ref\": \"refs/tags/v10.0-rc3\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"853629c2c4db0003b073cce0dddbfb69e73d3275\",\n+ \"rev\": \"68c4ee8a31b61a36f240ef01dd37e0cc85ac6567\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump source versions for v10.0-rc3
Problem: Tezos announced a new release candidate. Revisions used
have to be bumped.
Solution: updated versions for Tezos sources and opam-repository,
as well as the nixpkgs revision.
|
603,658
|
13.08.2021 01:19:44
| -10,800
|
c66cc56f73f55e0d000ec7180eba005b3d76000f
|
Fix NixOS modules testing
Problem: after updating the nixpkgs revision, the NixOS modules now
require clarifying the type of user created for tezos-<network> usage.
Solution: added setting isNormalUser when generating users in modules.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/modules/common.nix",
"new_path": "nix/modules/common.nix",
"diff": "@@ -77,7 +77,7 @@ rec {\ngenUsers = node-name: {\ngroups.\"tezos-${node-name}\" = { };\n- users.\"tezos-${node-name}\" = { group = \"tezos-${node-name}\"; };\n+ users.\"tezos-${node-name}\" = { group = \"tezos-${node-name}\"; isNormalUser = true; };\n};\ngenSystemdService = node-name: node-cfg: service-name: {\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix NixOS modules testing
Problem: after updating the nixpkgs revision, the NixOS modules now
require clarifying the type of user created for tezos-<network> usage.
Solution: added setting isNormalUser when generating users in modules.
|
603,658
|
16.08.2021 13:05:48
| -10,800
|
f4fe4b6faf8c0868e90073de39011c6cfbd5e231
|
Fix CI step for nix-building utils
Problem: we have a CI step to test if the utilities, copr-cli and
dput, can be built. Right now the step fails because of outdated
python36 packages.
Solution: changed the nix expressions to use python39 everywhere.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/util/copr-cli.nix",
"new_path": "nix/util/copr-cli.nix",
"diff": "@@ -8,15 +8,15 @@ let\nurl = \"https://pagure.io/copr/copr/archive/copr-cli-1.94-1/copr-copr-cli-1.94-1.tar.gz\";\nsha256 = \"0p6mrir6xhp9mi52dicd4j183bjvxlqdh03w57s7l22fcmrhsz26\";\n};\n- python-copr = pkgs.python36Packages.buildPythonApplication {\n- propagatedBuildInputs = with pkgs.python36Packages;\n+ python-copr = pkgs.python39Packages.buildPythonApplication {\n+ propagatedBuildInputs = with pkgs.python39Packages;\n[ requests-toolbelt requests marshmallow six munch ];\nsrc = \"${common-src}/python\";\nname = \"copr\";\nversion = \"1.109\";\n};\n-in pkgs.python36Packages.buildPythonApplication rec {\n- propagatedBuildInputs = with pkgs.python36Packages;\n+in pkgs.python39Packages.buildPythonApplication rec {\n+ propagatedBuildInputs = with pkgs.python39Packages;\n[ requests humanize jinja2 simplejson python-copr ];\nsrc = \"${common-src}/cli\";\nname = \"copr-cli\";\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/util/dput.nix",
"new_path": "nix/util/dput.nix",
"diff": "let\npkgs = import ../build/pkgs.nix { };\n-in pkgs.python36Packages.buildPythonApplication rec {\n- propagatedBuildInputs = with pkgs.python36Packages;\n+in pkgs.python39Packages.buildPythonApplication rec {\n+ propagatedBuildInputs = with pkgs.python39Packages;\n[ debian gpgme pygpgme testscenarios pkgs.gpgme setuptools ];\nsrc = builtins.fetchTarball {\nurl = \"https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/dput/1.1.0ubuntu1/dput_1.1.0ubuntu1.tar.xz\";\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix CI step for nix-building utils
Problem: we have a CI step to test if the utilities, copr-cli and
dput, can be built. Right now the step fails because of outdated
python36 packages.
Solution: changed the nix expressions to use python39 everywhere.
|
603,658
|
21.08.2021 11:53:02
| -7,200
|
1ba1bef196acce8ebc7477063cba9a72a35e395d
|
Bump source versions for v10.0
Problem: Tezos announced a new release. Revisions used
have to be bumped.
Solution: updated versions for Tezos sources.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v10.0-rc3\",\n+ \"ref\": \"refs/tags/v10.0\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"68c4ee8a31b61a36f240ef01dd37e0cc85ac6567\",\n+ \"rev\": \"ea8f2aefbcd54d23ae2919fea1802e2f1f977a94\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump source versions for v10.0
Problem: Tezos announced a new release. Revisions used
have to be bumped.
Solution: updated versions for Tezos sources.
|
603,658
|
21.08.2021 11:54:33
| -7,200
|
06870314ba0495a61afecee1865c6421d3426978
|
Update brew formulae for v10.0
Problem: Tezos announced a new release. We need to update
the brew bottles.
Solution: bumped the versions.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAccuser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAdminClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosBaker010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosCodec < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosEndorser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-granadanet.rb",
"new_path": "Formula/tezos-node-granadanet.rb",
"diff": "class TezosNodeGranadanet < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "class TezosNodeMainnet < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosNode < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSandbox < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "class TezosSignerHttp < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "class TezosSignerHttps < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "class TezosSignerTcp < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "class TezosSignerUnix < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSigner < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0-rc3\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n- version \"v10.0-rc3-1\"\n+ version \"v10.0-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update brew formulae for v10.0
Problem: Tezos announced a new release. We need to update
the brew bottles.
Solution: bumped the versions.
|
603,652
|
26.08.2021 14:38:20
| -10,800
|
479b8d9fb260fb0c526acc16d0b9ac62affe5f26
|
Enable native packaging in CI
Problem: We've reworked the way native packages are built and no longer
rely on opam-repository.
Solution: Enable native-packaging related steps in CI.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-raw.yml",
"new_path": ".buildkite/pipeline-raw.yml",
"diff": "@@ -88,59 +88,59 @@ steps:\n# files from nix/ are massively used in tests ifrastructure\n- nix/.*\n-# - label: test deb source packages via docker\n-# commands:\n-# - eval \"$SET_VERSION\"\n-# - ./docker/docker-tezos-packages.sh --os ubuntu --type source\n-# artifact_paths:\n-# - ./out/*\n-# branches: \"!master\"\n-# timeout_in_minutes: 60\n-# agents:\n-# queue: \"docker\"\n-# only_changes: &native_packaging_changes_regexes\n-# - docker/package/.*\n-# - docker/docker-tezos-packages.sh\n-# - meta.json\n-# - protocols.json\n-# - nix/nix/sources.json\n-# - label: test deb binary packages via docker\n-# commands:\n-# - eval \"$SET_VERSION\"\n-# # Building all binary packages will take significant amount of time, so we build only one\n-# # in order to ensure package generation sanity\n-# - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-010-PtGRANAD\n-# - rm -rf out\n-# # It takes much time to build binary package, so we do it only on master\n-# branches: \"master\"\n-# timeout_in_minutes: 90\n-# agents:\n-# queue: \"docker\"\n-# only_changes: *native_packaging_changes_regexes\n-# - label: test rpm source packages via docker\n-# commands:\n-# - eval \"$SET_VERSION\"\n-# - ./docker/docker-tezos-packages.sh --os fedora --type source\n-# artifact_paths:\n-# - ./out/*\n-# branches: \"!master\"\n-# timeout_in_minutes: 60\n-# agents:\n-# queue: \"docker\"\n-# only_changes: *native_packaging_changes_regexes\n-# - label: test rpm binary packages via docker\n-# commands:\n-# - eval \"$SET_VERSION\"\n-# # Building all binary packages will take significant amount of time, so we build only one\n-# # in order to ensure package generation sanity\n-# - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-010-PtGRANAD\n-# - rm -rf out\n-# # It takes much time to build binary package, so we do it only on master\n-# branches: \"master\"\n-# timeout_in_minutes: 90\n-# agents:\n-# queue: \"docker\"\n-# only_changes: *native_packaging_changes_regexes\n+ - label: test deb source packages via docker\n+ commands:\n+ - eval \"$SET_VERSION\"\n+ - ./docker/docker-tezos-packages.sh --os ubuntu --type source\n+ artifact_paths:\n+ - ./out/*\n+ branches: \"!master\"\n+ timeout_in_minutes: 60\n+ agents:\n+ queue: \"docker\"\n+ only_changes: &native_packaging_changes_regexes\n+ - docker/package/.*\n+ - docker/docker-tezos-packages.sh\n+ - meta.json\n+ - protocols.json\n+ - nix/nix/sources.json\n+ - label: test deb binary packages via docker\n+ commands:\n+ - eval \"$SET_VERSION\"\n+ # Building all binary packages will take significant amount of time, so we build only one\n+ # in order to ensure package generation sanity\n+ - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-010-PtGRANAD\n+ - rm -rf out\n+ # It takes much time to build binary package, so we do it only on master\n+ branches: \"master\"\n+ timeout_in_minutes: 90\n+ agents:\n+ queue: \"docker\"\n+ only_changes: *native_packaging_changes_regexes\n+ - label: test rpm source packages via docker\n+ commands:\n+ - eval \"$SET_VERSION\"\n+ - ./docker/docker-tezos-packages.sh --os fedora --type source\n+ artifact_paths:\n+ - ./out/*\n+ branches: \"!master\"\n+ timeout_in_minutes: 60\n+ agents:\n+ queue: \"docker\"\n+ only_changes: *native_packaging_changes_regexes\n+ - label: test rpm binary packages via docker\n+ commands:\n+ - eval \"$SET_VERSION\"\n+ # Building all binary packages will take significant amount of time, so we build only one\n+ # in order to ensure package generation sanity\n+ - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-010-PtGRANAD\n+ - rm -rf out\n+ # It takes much time to build binary package, so we do it only on master\n+ branches: \"master\"\n+ timeout_in_minutes: 90\n+ agents:\n+ queue: \"docker\"\n+ only_changes: *native_packaging_changes_regexes\n- label: create auto pre-release\ncommands:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Enable native packaging in CI
Problem: We've reworked the way native packages are built and no longer
rely on opam-repository.
Solution: Enable native-packaging related steps in CI.
|
603,652
|
27.08.2021 12:50:21
| -10,800
|
c1261a12eb5d2e443751df0d01f3ffc2e20e9081
|
Add missing Fedora build dependency
Problem: autoconf is now required for building binary native packages.
However, our Fedora-based docker image lacks it.
Solution: Add autoconf to the Fedora docker image which is used for
package building.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile-fedora",
"new_path": "docker/package/Dockerfile-fedora",
"diff": "FROM fedora:32\nRUN dnf update -y\nRUN dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel m4 perl git pkg-config \\\n- rpmdevtools python3 wget opam rsync which cargo\n+ rpmdevtools python3 wget opam rsync which cargo autoconf\nENV USER dockerbuilder\nRUN useradd dockerbuilder && mkdir /tezos-packaging\nENV HOME /tezos-packaging\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#274] Add missing Fedora build dependency
Problem: autoconf is now required for building binary native packages.
However, our Fedora-based docker image lacks it.
Solution: Add autoconf to the Fedora docker image which is used for
package building.
|
603,652
|
27.08.2021 12:55:17
| -10,800
|
4cdaf1125648cb262e4058d76f06aa26aba6dd89
|
Update release PR template
Problem: We no longer depend on Tezos packages in opam-repository.
Solution: Remove all requirements related to it from the opam-repository
and mention that native packages can now be published along with the
rest of distributions forms.
|
[
{
"change_type": "MODIFY",
"old_path": ".github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md",
"new_path": ".github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md",
"diff": "@@ -6,11 +6,6 @@ This PR introduces a new <!-- insert new version here --> release in tezos-packa\nE.g. in case we introduce a new changes to our native packages, it's not necessary to bump\nused Tezos sources, create a new release in this repository and update brew formulas.\n-\n-Note that opam-repository is usually updated with some delay, so CI may fail\n-due to lack of updated opam Tezos packages. In such case feel free to comment\n-out native-packaging-related CI steps from the pipeline until the opam-repository\n-is updated.\n-->\n<!-- List issues which are going to be resolved in the new packages from this\n@@ -31,7 +26,6 @@ Follows #\n- [ ] I updated `url :tag` and `version`s in brew formulas.\n- [ ] I updated release number in [meta.json](/serokell/tezos-packaging/tree/master/meta.json).\n- [ ] If the native release version was updated, I reset the `letter_version` in [model.py](/serokell/tezos-packaging/tree/master/docker/package/model.py).\n-- [ ] I removed native-packaging-related steps from CI in case opam-repository wasn't updated yet.\n#### In case the new Tezos release provides a new protocol and corresponding testnet\n@@ -50,7 +44,6 @@ and checking unfinished points in the merged release PR using this template.\n#### Create a new release in this repository\n- [ ] I created a new release that is based on the latest autorelease created by the CI.\n-- [ ] I enabled native-packaging-related CI steps after opam-repository got updated.\n#### Update brew bottles and repository mirrors\n@@ -63,8 +56,6 @@ and checking unfinished points in the merged release PR using this template.\n#### Publish new native packages\n-Once [opam-repository](https://opam.ocaml.org/packages/) is updated with the new version of Tezos packages.\n-\n- [ ] I published new Ubuntu packages, see [these instructions](/serokell/tezos-packaging/tree/master/docker#source-packages-and-publishing-them-on-launchpad-ppa).\n- [ ] I published new Fedora packages, see [these instructions](/serokell/tezos-packaging/tree/master/docker#srcrpm-packages).\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#274] Update release PR template
Problem: We no longer depend on Tezos packages in opam-repository.
Solution: Remove all requirements related to it from the opam-repository
and mention that native packages can now be published along with the
rest of distributions forms.
|
603,658
|
27.08.2021 17:34:34
| -7,200
|
28a77852b70011efc4c98746199544cb81fcf89b
|
Bump source versions for v10.1
Problem: Tezos announced a new release. Revisions used have to be
bumped.
Solution: updated versions for Tezos sources.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v10.0\",\n+ \"ref\": \"refs/tags/v10.1\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"ea8f2aefbcd54d23ae2919fea1802e2f1f977a94\",\n+ \"rev\": \"59524a1e8b0c41aab02ef2046d72a3db7a409803\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump source versions for v10.1
Problem: Tezos announced a new release. Revisions used have to be
bumped.
Solution: updated versions for Tezos sources.
|
603,658
|
27.08.2021 17:37:19
| -7,200
|
1b506b730ba13a658ef1e3297b318c6af836978a
|
Update brew formulae for v10.1
Problem: Tezos announced a new release. We need to update the brew
bottles.
Solution: bumped the versions.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAccuser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAdminClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosBaker010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosCodec < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosEndorser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-granadanet.rb",
"new_path": "Formula/tezos-node-granadanet.rb",
"diff": "class TezosNodeGranadanet < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "class TezosNodeMainnet < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosNode < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSandbox < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "class TezosSignerHttp < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "class TezosSignerHttps < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "class TezosSignerTcp < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "class TezosSignerUnix < Formula\nurl \"file:///dev/null\"\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSigner < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.0\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n- version \"v10.0-1\"\n+ version \"v10.1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update brew formulae for v10.1
Problem: Tezos announced a new release. We need to update the brew
bottles.
Solution: bumped the versions.
|
603,652
|
27.08.2021 14:28:33
| -10,800
|
b600600f49fae6adadf7eb40e3e9b7e9461bd130
|
Automatic node storage upgrade
Problem: 9.* to 10.* upgrade requires a storage upgrade.
We want to automate this upgrade process.
Solution: Check current storage version in the node service pre-start
script and perform an upgrade in case it's needed.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -168,7 +168,7 @@ def mk_node_unit(suffix, env, desc):\nenvironment=env,\nexec_start=\"/usr/bin/tezos-node-start\",\nexec_start_pre=[\"/usr/bin/tezos-node-prestart\"],\n- timeout_start_sec=\"450s\",\n+ timeout_start_sec=\"2400s\",\nstate_directory=\"tezos\",\nuser=\"tezos\",\n),\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-prestart",
"new_path": "docker/package/scripts/tezos-node-prestart",
"diff": "@@ -8,6 +8,9 @@ set -euo pipefail\nnode=\"/usr/bin/tezos-node\"\n+\"$node\" upgrade --data-dir \"$DATA_DIR\" storage\n+rm -rf \"$DATA_DIR/lmdb_store_to_remove\"\n+\nif [[ ! -f \"$DATA_DIR/identity.json\" ]]; then\n\"$node\" identity generate --data-dir \"$DATA_DIR\"\nfi\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#291] Automatic node storage upgrade
Problem: 9.* to 10.* upgrade requires a storage upgrade.
We want to automate this upgrade process.
Solution: Check current storage version in the node service pre-start
script and perform an upgrade in case it's needed.
|
603,658
|
31.08.2021 07:14:00
| -7,200
|
1379614ce08da3c28c2e0cc6b713fe0065f14377
|
Add brew bottle hashes for v10.1
Problem: v10.1 bottles have been built and added to the latest release,
but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"64179ce91fd3448d141cf8a5e3ca2bcbdc635cd4878af978025a5424a46e469f\"\n+ sha256 cellar: :any, catalina: \"528626dee856551e823bec4b842ebdd0f8845876ce682897aa240c7a83ab4982\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n+ sha256 cellar: :any, mojave: \"a4a6ac7883b335fb6a68dd91874f50cb2d5eaf742a290887bb291772bf7a8d52\"\n+ sha256 cellar: :any, catalina: \"13ec405a5eff913adfd6b889ec50360242b201663ecb9226b73559e595d4cb62\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"389e7ed6281ac1ba96fb803b316e9576570ce4f748f0622b28ca6256e1581801\"\n+ sha256 cellar: :any, catalina: \"aeb1ae3f4ea83c9e2748f1e334ec2b593983620ae8a75d7aac51f975a17b9b3b\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n+ sha256 cellar: :any, mojave: \"e1460b388f585ee32a872794049298444b95cf004b3e83b7862622bccd975a6a\"\n+ sha256 cellar: :any, catalina: \"c70ef3e990f7e183440792952af9f76eae80315dae1f1bf3fcef7a6e716c8bd7\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n+ sha256 cellar: :any, mojave: \"50e954c8b12cb2546ceebaae4b1017464fe019e375d12e9eebb530aae6cf5766\"\n+ sha256 cellar: :any, catalina: \"8defba198305e866140c24cd7fda0b26009bab2f0fb13092693fb81a5dec7552\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"208fff9729933a015bf32e0654514753b8190e7a1ba1dc62fbd837627a0bf6d8\"\n+ sha256 cellar: :any, catalina: \"9daec205ac076986e4b35d51bd001c7622e7b51c2482c365818f053b8f0569fc\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n+ sha256 cellar: :any, mojave: \"31454d57082c3a9aad50af24cdbe58f4fe9bc960cae4be0458a51daeced6b4ac\"\n+ sha256 cellar: :any, catalina: \"799189451f71ed61918460ed0d64c1e4b465d3d9f4e5660a62ff5de48b6c6065\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n+ sha256 cellar: :any, mojave: \"09c16afce90f3191a743108957e0b220daddcbcaee2196e4fa449024a4912fb7\"\n+ sha256 cellar: :any, catalina: \"f0eb0c30bfa061822984fe6afecd6f0cf79f428bcb773c5ea4263347080eed68\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n+ sha256 cellar: :any, mojave: \"fccdbd84e9e7edcb558bf7bc93e1e758eb71b4b897a68b8d54d3f9eba442c7a3\"\n+ sha256 cellar: :any, catalina: \"89d34c38400ddc1ce34551e7e4883056c5eddad5db8a94618508c7538160019f\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add brew bottle hashes for v10.1
Problem: v10.1 bottles have been built and added to the latest release,
but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
603,652
|
02.09.2021 10:48:21
| -10,800
|
0c8421eec214b4e6d39c50b25b4163dc21567aa2
|
Bump source versions for v10.2
Problem: Tezos announced a new release. Revisions used have to be
bumped.
Solution: updated versions for Tezos sources.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v10.1\",\n+ \"ref\": \"refs/tags/v10.2\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"59524a1e8b0c41aab02ef2046d72a3db7a409803\",\n+ \"rev\": \"5bfd311b701015381338e73a30c74415fa493c10\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump source versions for v10.2
Problem: Tezos announced a new release. Revisions used have to be
bumped.
Solution: updated versions for Tezos sources.
|
603,652
|
02.09.2021 10:49:53
| -10,800
|
f1ec658d76cbd33cabfa522e7326ca52560c35dd
|
Update brew formulae for v10.2
Problem: Tezos announced a new release. We need to update the brew
bottles.
Solution: bumped the versions, removed 10.1 bottles hashes.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAccuser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n- sha256 cellar: :any, mojave: \"64179ce91fd3448d141cf8a5e3ca2bcbdc635cd4878af978025a5424a46e469f\"\n- sha256 cellar: :any, catalina: \"528626dee856551e823bec4b842ebdd0f8845876ce682897aa240c7a83ab4982\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAdminClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n- sha256 cellar: :any, mojave: \"a4a6ac7883b335fb6a68dd91874f50cb2d5eaf742a290887bb291772bf7a8d52\"\n- sha256 cellar: :any, catalina: \"13ec405a5eff913adfd6b889ec50360242b201663ecb9226b73559e595d4cb62\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosBaker010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n- sha256 cellar: :any, mojave: \"389e7ed6281ac1ba96fb803b316e9576570ce4f748f0622b28ca6256e1581801\"\n- sha256 cellar: :any, catalina: \"aeb1ae3f4ea83c9e2748f1e334ec2b593983620ae8a75d7aac51f975a17b9b3b\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n- sha256 cellar: :any, mojave: \"e1460b388f585ee32a872794049298444b95cf004b3e83b7862622bccd975a6a\"\n- sha256 cellar: :any, catalina: \"c70ef3e990f7e183440792952af9f76eae80315dae1f1bf3fcef7a6e716c8bd7\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosCodec < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n- sha256 cellar: :any, mojave: \"50e954c8b12cb2546ceebaae4b1017464fe019e375d12e9eebb530aae6cf5766\"\n- sha256 cellar: :any, catalina: \"8defba198305e866140c24cd7fda0b26009bab2f0fb13092693fb81a5dec7552\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosEndorser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -28,8 +28,6 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n- sha256 cellar: :any, mojave: \"208fff9729933a015bf32e0654514753b8190e7a1ba1dc62fbd837627a0bf6d8\"\n- sha256 cellar: :any, catalina: \"9daec205ac076986e4b35d51bd001c7622e7b51c2482c365818f053b8f0569fc\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-granadanet.rb",
"new_path": "Formula/tezos-node-granadanet.rb",
"diff": "class TezosNodeGranadanet < Formula\nurl \"file:///dev/null\"\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "class TezosNodeMainnet < Formula\nurl \"file:///dev/null\"\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosNode < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n- sha256 cellar: :any, mojave: \"31454d57082c3a9aad50af24cdbe58f4fe9bc960cae4be0458a51daeced6b4ac\"\n- sha256 cellar: :any, catalina: \"799189451f71ed61918460ed0d64c1e4b465d3d9f4e5660a62ff5de48b6c6065\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSandbox < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n- sha256 cellar: :any, mojave: \"09c16afce90f3191a743108957e0b220daddcbcaee2196e4fa449024a4912fb7\"\n- sha256 cellar: :any, catalina: \"f0eb0c30bfa061822984fe6afecd6f0cf79f428bcb773c5ea4263347080eed68\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "class TezosSignerHttp < Formula\nurl \"file:///dev/null\"\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "class TezosSignerHttps < Formula\nurl \"file:///dev/null\"\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "class TezosSignerTcp < Formula\nurl \"file:///dev/null\"\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "class TezosSignerUnix < Formula\nurl \"file:///dev/null\"\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSigner < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n- version \"v10.1-1\"\n+ version \"v10.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n- sha256 cellar: :any, mojave: \"fccdbd84e9e7edcb558bf7bc93e1e758eb71b4b897a68b8d54d3f9eba442c7a3\"\n- sha256 cellar: :any, catalina: \"89d34c38400ddc1ce34551e7e4883056c5eddad5db8a94618508c7538160019f\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update brew formulae for v10.2
Problem: Tezos announced a new release. We need to update the brew
bottles.
Solution: bumped the versions, removed 10.1 bottles hashes.
|
603,652
|
03.09.2021 10:02:34
| -10,800
|
d75ede482675f9e976f207d5a94fbb2ebeade183
|
Add brew bottle hashes for v10.2
Problem: v10.2 bottles have been built and added to the latest release,
but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"4ba3a76ae7db229c432039a84a2ca55fbdf93e37d49419201b81d96964eaf18a\"\n+ sha256 cellar: :any, catalina: \"35659c58f1df616e046b836fa239a9d4b8ff47db954577606930c295d59146da\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n+ sha256 cellar: :any, mojave: \"13d05a8d96a584d1b97e80289e39ead20a57188fa9814eab4d075f22a0642ba4\"\n+ sha256 cellar: :any, catalina: \"c431c23f6b92d8690be76b5135ae1d8569017e3a4c4b01f0aa020d51ddbc6e8b\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"83402ddc80e97fbc6bfc23721776f3db8419f754da62b57aff544180320fb850\"\n+ sha256 cellar: :any, catalina: \"f5846339abc701c3a65524c62eb70a41b0c354ffde5e6601cde3693024e50460\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n+ sha256 cellar: :any, mojave: \"654ffbc594b11f563e97119af2aeb304d5a1351625ea2aa3648d1e253ee2d58a\"\n+ sha256 cellar: :any, catalina: \"340b4a52e21a15b7f52c7785179c4226d6a8bc6957f12ba6f5ffb2455e150706\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n+ sha256 cellar: :any, mojave: \"864e31f9720ceda7d1075e5282eb89aadb57e79903a1c950909be5538d0588a9\"\n+ sha256 cellar: :any, catalina: \"6234e4ecc9453179b4393840459302214acb10661631f96558c0bb68ff31c9ac\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n+ sha256 cellar: :any, mojave: \"a047be8cec6b9a03511313a55906462f9e1313efcf787f1b1072288b1d444a09\"\n+ sha256 cellar: :any, catalina: \"c604ffec47910372a3a0c6442fa7090924d4d41eb64c5e1e00fef8c0068c9fc9\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n+ sha256 cellar: :any, mojave: \"357de6612ea77969189d4f6ea4aa2c50caffcfd6170a3a8c2179c36ccf7f27aa\"\n+ sha256 cellar: :any, catalina: \"48d629b964558f0831420d119699b8aaeed5b2397206946a6e5737f3ed4fb1e7\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n+ sha256 cellar: :any, mojave: \"536f9184499a3fb993d510de1e88f3e09e2c161d64920f9f1875369d73150e72\"\n+ sha256 cellar: :any, catalina: \"92e1d3123a088e3c897e9bf2f9ed1445007025015ad65c16ea8ea0b83706314c\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -27,6 +27,8 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n+ sha256 cellar: :any, mojave: \"9f4feec8809d70275f42c65055f0374f8895a6a35d4f2da65d09e2498547c6a8\"\n+ sha256 cellar: :any, catalina: \"c3ea1246af5ed67feed4fe4bc57bed3bee879ee8b3af180fe80f98f1f2861558\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add brew bottle hashes for v10.2
Problem: v10.2 bottles have been built and added to the latest release,
but their hashes are not yet in the formulae.
Solution: added hashes for Mojave and Catalina to brew formulae.
|
603,664
|
14.09.2021 17:00:43
| -10,800
|
8205ab06037161d33425618dd0dd618ddd2752d1
|
Bump nix dependencies, switch back to serokell/nixpkgs
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": \"\",\n\"owner\": \"kolloch\",\n\"repo\": \"crate2nix\",\n- \"rev\": \"be7de80a3a94f169f8e666d63031af3122b61f6e\",\n- \"sha256\": \"1yggdxkxgnpq23kzgcij8ljahvmvj5cs88vy9sa2wsmqsjpiv2h6\",\n+ \"rev\": \"773c8775e256fa7ab7fc39c28b25b8fe4086a082\",\n+ \"sha256\": \"1z6g9m17vy8v6g0q32k7qpkkz6ry3fkwgdixqlwa271phlwrnn55\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/kolloch/crate2nix/archive/be7de80a3a94f169f8e666d63031af3122b61f6e.tar.gz\",\n+ \"url\": \"https://github.com/kolloch/crate2nix/archive/773c8775e256fa7ab7fc39c28b25b8fe4086a082.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"nixpkgs\": {\n\"branch\": \"master\",\n\"description\": \"Pinned Nixpkgs tree (master follows nixos-unstable-small, only tags have stable history)\",\n\"homepage\": \"\",\n- \"owner\": \"NixOS\",\n+ \"owner\": \"serokell\",\n\"repo\": \"nixpkgs\",\n- \"rev\": \"5d73f669a84b5271ae0993244b389411794a1a47\",\n- \"sha256\": \"0bbmdfgg1x6k5wzvx4371mv0f29xlhl4vng0rpap3jlwf7qlcwf9\",\n+ \"rev\": \"1714a2ead1a18678afa3cbf75dff3f024c579061\",\n+ \"sha256\": \"12lypkc60p1w4v4j6gr097hdp1kj7fwhhi5yhb3j73z2l99zrq1d\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/NixOS/nixpkgs/archive/5d73f669a84b5271ae0993244b389411794a1a47.tar.gz\",\n+ \"url\": \"https://github.com/serokell/nixpkgs/archive/1714a2ead1a18678afa3cbf75dff3f024c579061.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-nix\": {\n\"homepage\": \"https://opam.ocaml.org\",\n\"owner\": \"ocaml\",\n\"repo\": \"opam-repository\",\n- \"rev\": \"aad0f94dee43a430df1f6844690ab429ab089a3c\",\n- \"sha256\": \"1ixpxjwigjs731kf1g206mjadshzwxkbnfd234p1yykrlmzpb4zy\",\n+ \"rev\": \"3e92793804b7f34fca09fb17e2ebafd6d29d90cf\",\n+ \"sha256\": \"175fdlydmwn6kb09dyz2pz8z2wdsa2lkfys0yqdgv237m67mk2yh\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/aad0f94dee43a430df1f6844690ab429ab089a3c.tar.gz\",\n+ \"url\": \"https://github.com/ocaml/opam-repository/archive/3e92793804b7f34fca09fb17e2ebafd6d29d90cf.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"serokell-nix\": {\n\"homepage\": \"\",\n\"owner\": \"serokell\",\n\"repo\": \"serokell.nix\",\n- \"rev\": \"c8d39be5ea3b5cac5da952f28d37095ef385b89f\",\n- \"sha256\": \"0db2hgh2fgpr8hn7rpg1fixjsvl20clj6ld893825rn56a2aq76v\",\n+ \"rev\": \"46d762e5107d10ad409295a7f668939c21cc048d\",\n+ \"sha256\": \"04v171r3ii285j3q9ma6sgy7gfj1m1aml6akv01icqwpvailddpd\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/serokell/serokell.nix/archive/c8d39be5ea3b5cac5da952f28d37095ef385b89f.tar.gz\",\n+ \"url\": \"https://github.com/serokell/serokell.nix/archive/46d762e5107d10ad409295a7f668939c21cc048d.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.nix",
"new_path": "nix/nix/sources.nix",
"diff": "@@ -6,52 +6,63 @@ let\n# The fetchers. fetch_<type> fetches specs of type <type>.\n#\n- fetch_file = pkgs: spec:\n+ fetch_file = pkgs: name: spec:\n+ let\n+ name' = sanitizeName name + \"-src\";\n+ in\nif spec.builtin or true then\n- builtins_fetchurl { inherit (spec) url sha256; }\n+ builtins_fetchurl { inherit (spec) url sha256; name = name'; }\nelse\n- pkgs.fetchurl { inherit (spec) url sha256; };\n+ pkgs.fetchurl { inherit (spec) url sha256; name = name'; };\n- fetch_tarball = pkgs: spec:\n+ fetch_tarball = pkgs: name: spec:\n+ let\n+ name' = sanitizeName name + \"-src\";\n+ in\nif spec.builtin or true then\n- builtins_fetchTarball { inherit (spec) url sha256; }\n+ builtins_fetchTarball { name = name'; inherit (spec) url sha256; }\nelse\n- pkgs.fetchzip { inherit (spec) url sha256; };\n-\n- fetch_git = spec:\n- builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };\n+ pkgs.fetchzip { name = name'; inherit (spec) url sha256; };\n- fetch_builtin-tarball = spec:\n- builtins.trace\n- ''\n- WARNING:\n- The niv type \"builtin-tarball\" will soon be deprecated. You should\n- instead use `builtin = true`.\n+ fetch_git = name: spec:\n+ let\n+ ref =\n+ if spec ? ref then spec.ref else\n+ if spec ? branch then \"refs/heads/${spec.branch}\" else\n+ if spec ? tag then \"refs/tags/${spec.tag}\" else\n+ abort \"In git source '${name}': Please specify `ref`, `tag` or `branch`!\";\n+ in\n+ builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };\n- $ niv modify <package> -a type=tarball -a builtin=true\n- ''\n- builtins_fetchTarball { inherit (spec) url sha256; };\n+ fetch_local = spec: spec.path;\n- fetch_builtin-url = spec:\n- builtins.trace\n- ''\n- WARNING:\n- The niv type \"builtin-url\" will soon be deprecated. You should\n- instead use `builtin = true`.\n+ fetch_builtin-tarball = name: throw\n+ ''[${name}] The niv type \"builtin-tarball\" is deprecated. You should instead use `builtin = true`.\n+ $ niv modify ${name} -a type=tarball -a builtin=true'';\n- $ niv modify <package> -a type=file -a builtin=true\n- ''\n- (builtins_fetchurl { inherit (spec) url sha256; });\n+ fetch_builtin-url = name: throw\n+ ''[${name}] The niv type \"builtin-url\" will soon be deprecated. You should instead use `builtin = true`.\n+ $ niv modify ${name} -a type=file -a builtin=true'';\n#\n# Various helpers\n#\n+ # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695\n+ sanitizeName = name:\n+ (\n+ concatMapStrings (s: if builtins.isList s then \"-\" else s)\n+ (\n+ builtins.split \"[^[:alnum:]+._?=-]+\"\n+ ((x: builtins.elemAt (builtins.match \"\\\\.*(.*)\" x) 0) name)\n+ )\n+ );\n+\n# The set of packages used when specs are fetched using non-builtins.\n- mkPkgs = sources:\n+ mkPkgs = sources: system:\nlet\nsourcesNixpkgs =\n- import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};\n+ import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };\nhasNixpkgsPath = builtins.any (x: x.prefix == \"nixpkgs\") builtins.nixPath;\nhasThisAsNixpkgsPath = <nixpkgs> == ./.;\nin\n@@ -71,14 +82,27 @@ let\nif ! builtins.hasAttr \"type\" spec then\nabort \"ERROR: niv spec ${name} does not have a 'type' attribute\"\n- else if spec.type == \"file\" then fetch_file pkgs spec\n- else if spec.type == \"tarball\" then fetch_tarball pkgs spec\n- else if spec.type == \"git\" then fetch_git spec\n- else if spec.type == \"builtin-tarball\" then fetch_builtin-tarball spec\n- else if spec.type == \"builtin-url\" then fetch_builtin-url spec\n+ else if spec.type == \"file\" then fetch_file pkgs name spec\n+ else if spec.type == \"tarball\" then fetch_tarball pkgs name spec\n+ else if spec.type == \"git\" then fetch_git name spec\n+ else if spec.type == \"local\" then fetch_local spec\n+ else if spec.type == \"builtin-tarball\" then fetch_builtin-tarball name\n+ else if spec.type == \"builtin-url\" then fetch_builtin-url name\nelse\nabort \"ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}\";\n+ # If the environment variable NIV_OVERRIDE_${name} is set, then use\n+ # the path directly as opposed to the fetched source.\n+ replace = name: drv:\n+ let\n+ saneName = stringAsChars (c: if isNull (builtins.match \"[a-zA-Z0-9]\" c) then \"_\" else c) name;\n+ ersatz = builtins.getEnv \"NIV_OVERRIDE_${saneName}\";\n+ in\n+ if ersatz == \"\" then drv else\n+ # this turns the string into an actual Nix path (for both absolute and\n+ # relative paths)\n+ if builtins.substring 0 1 ersatz == \"/\" then /. + ersatz else /. + builtins.getEnv \"PWD\" + \"/${ersatz}\";\n+\n# Ports of functions for older nix versions\n# a Nix version of mapAttrs if the built-in doesn't exist\n@@ -87,23 +111,37 @@ let\nlistToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))\n);\n+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295\n+ range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);\n+\n+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257\n+ stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));\n+\n+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269\n+ stringAsChars = f: s: concatStrings (map f (stringToCharacters s));\n+ concatMapStrings = f: list: concatStrings (map f list);\n+ concatStrings = builtins.concatStringsSep \"\";\n+\n+ # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331\n+ optionalAttrs = cond: as: if cond then as else {};\n+\n# fetchTarball version that is compatible between all the versions of Nix\n- builtins_fetchTarball = { url, sha256 }@attrs:\n+ builtins_fetchTarball = { url, name ? null, sha256 }@attrs:\nlet\ninherit (builtins) lessThan nixVersion fetchTarball;\nin\nif lessThan nixVersion \"1.12\" then\n- fetchTarball { inherit url; }\n+ fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))\nelse\nfetchTarball attrs;\n# fetchurl version that is compatible between all the versions of Nix\n- builtins_fetchurl = { url, sha256 }@attrs:\n+ builtins_fetchurl = { url, name ? null, sha256 }@attrs:\nlet\ninherit (builtins) lessThan nixVersion fetchurl;\nin\nif lessThan nixVersion \"1.12\" then\n- fetchurl { inherit url; }\n+ fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))\nelse\nfetchurl attrs;\n@@ -115,14 +153,15 @@ let\nthen abort\n\"The values in sources.json should not have an 'outPath' attribute\"\nelse\n- spec // { outPath = fetch config.pkgs name spec; }\n+ spec // { outPath = replace name (fetch config.pkgs name spec); }\n) config.sources;\n# The \"config\" used by the fetchers\nmkConfig =\n- { sourcesFile ? ./sources.json\n- , sources ? builtins.fromJSON (builtins.readFile sourcesFile)\n- , pkgs ? mkPkgs sources\n+ { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null\n+ , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)\n+ , system ? builtins.currentSystem\n+ , pkgs ? mkPkgs sources system\n}: rec {\n# The sources, i.e. the attribute set of spec name to spec\ninherit sources;\n@@ -130,5 +169,6 @@ let\n# The \"pkgs\" (evaluated nixpkgs) to use for e.g. non-builtin fetchers\ninherit pkgs;\n};\n+\nin\nmkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump nix dependencies, switch back to serokell/nixpkgs
|
603,664
|
14.09.2021 17:01:04
| -10,800
|
82fbab12a89a27f42c8dcf9c6569777bbec5c805
|
Remove nix overlay for `gh` tool
Nixpkgs has a newer version now
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/shell.nix",
"new_path": "scripts/shell.nix",
"diff": "#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-let\n- overlays =\n- [\n- (self: super: {\n- gh = (super.callPackage \"${super.path}/pkgs/applications/version-management/git-and-tools/gh\" {\n- buildGoModule = args: super.buildGoModule (args // rec {\n- version = \"1.2.0\";\n- vendorSha256 = \"0ybbwbw4vdsxdq4w75s1i0dqad844sfgs69b3vlscwfm6g3i9h51\";\n- src = self.fetchFromGitHub {\n- owner = \"cli\";\n- repo = \"cli\";\n- rev = \"v${version}\";\n- sha256 = \"17hbgi1jh4p07r4p5mr7w7p01i6zzr28mn5i4jaki7p0jwfqbvvi\";\n- };\n- });\n- });\n- })\n- ];\n-in\n-\n-{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs { inherit overlays; } }:\n+{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs { } }:\nwith pkgs;\nmkShell {\nbuildInputs = [ gh git rename gnupg ];\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Remove nix overlay for `gh` tool
Nixpkgs has a newer version now
|
603,652
|
21.09.2021 13:42:17
| -10,800
|
24c00aeff1e3e251315e9297c83ba8cf7b875922
|
[morley#664] Allow alpha protocol
Problem: Alpha protocol is now required to run 'tezos-client' in mockup
mode.
Solution: Allow it and adjust hacks.nix.
See
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -229,6 +229,9 @@ rec {\npropagatedBuildInputs = buildInputs;\n});\n+ tezos-protocol-alpha = osuper.tezos-protocol-alpha.overrideAttrs (o : {\n+ buildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n+ });\ntezos-protocol-000-Ps9mPmXa = osuper.tezos-protocol-000-Ps9mPmXa.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n@@ -277,6 +280,9 @@ rec {\ntezos-protocol-genesis = osuper.tezos-protocol-genesis.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n+ tezos-protocol-plugin-alpha = osuper.tezos-protocol-plugin-alpha.overrideAttrs (o : {\n+ buildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n+ });\ntezos-protocol-plugin-007-PsDELPH1 = osuper.tezos-protocol-plugin-007-PsDELPH1.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n@@ -295,6 +301,11 @@ rec {\n(o: rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\n});\n+ tezos-protocol-alpha-parameters = osuper.tezos-protocol-alpha-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\ntezos-protocol-006-PsCARTHA-parameters = osuper.tezos-protocol-006-PsCARTHA-parameters.overrideAttrs\n(o: rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\n@@ -332,7 +343,7 @@ rec {\ntezos-client = osuper.tezos-client.overrideAttrs\n(o: {\n- buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper tezos-client-alpha-commands-registration ];\npostInstall = \"rm $bin/tezos-admin-client $bin/*.sh\";\npostFixup = zcash-post-fixup o;\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "{\n\"ignored\": [\n- \"alpha\",\n\"demo-counter\"\n],\n\"allowed\": [\n+ \"alpha\",\n\"genesis\",\n\"genesis-carthagenet\",\n\"000-Ps9mPmXa\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[morley#664] Allow alpha protocol
Problem: Alpha protocol is now required to run 'tezos-client' in mockup
mode.
Solution: Allow it and adjust hacks.nix.
See https://gitlab.com/morley-framework/morley/-/issues/664.
|
603,652
|
21.09.2021 18:13:37
| -10,800
|
d9d4f6f0f776db234cb2ae6879e9de05692bf859
|
Add script for native packages publishing
Problem: We want to automate our release routine as much as possible.
Native packages publishing is one of the parts of this routine.
Solution: Add script that publishes Fedora and Ubuntu packages from the
given directory.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/publish-native-packages.sh",
"diff": "+#! /usr/bin/env nix-shell\n+#! nix-shell shell.nix -i bash\n+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+set -euo pipefail\n+\n+source_packages_path=\"$1\"\n+\n+# Basic dput configuration\n+cat >dput.cfg <<EOL\n+[DEFAULT]\n+login = *\n+method = ftp\n+hash = md5\n+allow_unsigned_uploads = 0\n+allow_dcut = 0\n+run_lintian = 0\n+run_dinstall = 0\n+check_version = 0\n+scp_compress = 0\n+post_upload_command =\n+pre_upload_command =\n+passive_ftp = 1\n+default_host_main =\n+allowed_distributions = (?!UNRELEASED)\n+\n+[tezos-serokell]\n+fqdn = ppa.launchpad.net\n+method = ftp\n+incoming = ~serokell/ubuntu/tezos\n+login = anonymous\n+\n+[tezos-rc-serokell]\n+fqdn = ppa.launchpad.net\n+method = ftp\n+incoming = ~serokell/ubuntu/tezos-rc\n+login = anonymous\n+EOL\n+\n+if [[ $TEZOS_VERSION =~ v.*-rc[0-9]* ]]; then\n+ launchpad_ppa=\"tezos-rc-serokell\"\n+ copr_project=\"@Serokell/Tezos-rc\"\n+else\n+ launchpad_ppa=\"tezos-serokell\"\n+ copr_project=\"@Serokell/Tezos\"\n+fi\n+\n+for f in \"$source_packages_path\"/*.changes; do\n+ sed -i 's/^Changed-By: .*$/Changed-By: Serokell <tezos-packaging@serokell.io>/' \"$f\"\n+ debsign \"$f\"\n+ execute-dput -c dput.cfg \"$launchpad_ppa\" \"$f\"\n+done\n+\n+for f in \"$source_packages_path\"/*.src.rpm; do\n+ rpmsign --define=\"%_gpg_name Serokell <tezos-packaging@serokell.io>\" --define=\"%__gpg $(which gpg)\" --addsign \"$f\"\n+ /run/wrappers/bin/sudo -u copr-uploader /run/current-system/sw/bin/copr-cli build \"$copr_project\" --nowait \"$f\"\n+done\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shell.nix",
"new_path": "scripts/shell.nix",
"diff": "{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs { } }:\nwith pkgs;\nmkShell {\n- buildInputs = [ gh git rename gnupg ];\n+ buildInputs = [ gh git rename gnupg dput rpm debian-devscripts which util-linux perl ];\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#287] Add script for native packages publishing
Problem: We want to automate our release routine as much as possible.
Native packages publishing is one of the parts of this routine.
Solution: Add script that publishes Fedora and Ubuntu packages from the
given directory.
|
603,652
|
21.09.2021 18:18:22
| -10,800
|
4b05b624396fd42c918d4ace2ce7111993c2bcc4
|
Add native packages publishing to CI
Problem: We want CI to publish native packages when it's safe to do.
Solution: Automatically publish native packages for the first release
for the given upstream version (i.e. that has 1 release number).
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-for-tags.yml",
"new_path": ".buildkite/pipeline-for-tags.yml",
"diff": "@@ -13,9 +13,30 @@ steps:\nartifact_paths:\n- '*.bottle.*'\n- - wait\n+ - label: Build source packages\n+ key: build-source-packages\n+ if: build.tag =~ /^v.*-1/\n+ agents:\n+ queue: \"docker\"\n+ commands:\n+ - export TEZOS_VERSION=\"$(cat nix/nix/sources.json | jq -r '.tezos.ref' | cut -d'/' -f3)\"\n+ - ./docker/docker-tezos-packages.sh --os ubuntu --type source\n+ - ./docker/docker-tezos-packages.sh --os fedora --type source\n+ artifact_paths:\n+ - ./out/*\n+\n+ - label: Publish native packages\n+ if: build.tag =~ /^v.*-1/\n+ depends_on:\n+ - \"build-source-packages\"\n+ commands:\n+ - export TEZOS_VERSION=\"$(cat nix/nix/sources.json | jq -r '.tezos.ref' | cut -d'/' -f3)\"\n+ - buildkite-agent artifact download \"out/*\" . --step build-source-packages\n+ - ./scripts/publish-native-packages.sh out\n- label: Attach bottles to the release\n+ depends_on:\n+ - \"build-bottles\"\nif: build.tag =~ /^v.*/\ncommands:\n- buildkite-agent artifact download --step build-bottles \"*\" .\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#287] Add native packages publishing to CI
Problem: We want CI to publish native packages when it's safe to do.
Solution: Automatically publish native packages for the first release
for the given upstream version (i.e. that has 1 release number).
|
603,652
|
24.09.2021 16:55:13
| -10,800
|
f3d4337644426d640dd4b5579f72af2f0de05aaf
|
Use copr-cli and dput from nixpkgs
Problem: Our nixpkgs fork now has copr-cli and dput and there is no
sense in defining them in this repo additionally.
Solution: Remove nix expressions for them and corresponding CI step.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-raw.yml",
"new_path": ".buildkite/pipeline-raw.yml",
"diff": "@@ -20,8 +20,6 @@ steps:\nonly_changes:\n- .buildkite/filter-pipeline.py\n- tests/buildkite/.*\n- - label: build utils\n- command: nix-build nix/util/* --no-out-link\n- label: check auto-inserting bottle hashes\ncommands:\n- cd tests/bottle-hashes/\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": \"\",\n\"owner\": \"serokell\",\n\"repo\": \"nixpkgs\",\n- \"rev\": \"1714a2ead1a18678afa3cbf75dff3f024c579061\",\n- \"sha256\": \"12lypkc60p1w4v4j6gr097hdp1kj7fwhhi5yhb3j73z2l99zrq1d\",\n+ \"rev\": \"be220b2dc47092c1e739bf6aaf630f29e71fe1c4\",\n+ \"sha256\": \"0fsc6l47gvvs7p2dkbhkrri3gvz0qwjdqbi6d20r257ymbkq9lg0\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/serokell/nixpkgs/archive/1714a2ead1a18678afa3cbf75dff3f024c579061.tar.gz\",\n+ \"url\": \"https://github.com/serokell/nixpkgs/archive/be220b2dc47092c1e739bf6aaf630f29e71fe1c4.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-nix\": {\n"
},
{
"change_type": "DELETE",
"old_path": "nix/util/copr-cli.nix",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-let\n- pkgs = import ../build/pkgs.nix { };\n- common-src = builtins.fetchTarball {\n- url = \"https://pagure.io/copr/copr/archive/copr-cli-1.94-1/copr-copr-cli-1.94-1.tar.gz\";\n- sha256 = \"0p6mrir6xhp9mi52dicd4j183bjvxlqdh03w57s7l22fcmrhsz26\";\n- };\n- python-copr = pkgs.python39Packages.buildPythonApplication {\n- propagatedBuildInputs = with pkgs.python39Packages;\n- [ requests-toolbelt requests marshmallow six munch ];\n- src = \"${common-src}/python\";\n- name = \"copr\";\n- version = \"1.109\";\n- };\n-in pkgs.python39Packages.buildPythonApplication rec {\n- propagatedBuildInputs = with pkgs.python39Packages;\n- [ requests humanize jinja2 simplejson python-copr ];\n- src = \"${common-src}/cli\";\n- name = \"copr-cli\";\n- version = \"1.94.1\";\n- doCheck = false;\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "nix/util/dput.nix",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-let\n- pkgs = import ../build/pkgs.nix { };\n-in pkgs.python39Packages.buildPythonApplication rec {\n- propagatedBuildInputs = with pkgs.python39Packages;\n- [ debian gpgme pygpgme testscenarios pkgs.gpgme setuptools ];\n- src = builtins.fetchTarball {\n- url = \"https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/dput/1.1.0ubuntu1/dput_1.1.0ubuntu1.tar.xz\";\n- sha256 = \"1dgmyhmpnw71y1qs9z6npi9m46qh2vjs5g2vvaj1ak57333w2f7d\";\n- };\n- name = \"dput\";\n- version = \"1.1.0\";\n- doCheck = false;\n-}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#287] Use copr-cli and dput from nixpkgs
Problem: Our nixpkgs fork now has copr-cli and dput and there is no
sense in defining them in this repo additionally.
Solution: Remove nix expressions for them and corresponding CI step.
|
603,658
|
22.09.2021 01:58:14
| -7,200
|
9640d77bc49b216b1c7aa74cafc430690ada604b
|
Add script to bump brew versions
Problem: before adding new bottle hashes, we need to update versions
and tags in formulae and clean out old hashes. Currently there is no
way to easily do it automatically.
Solution: added a bash script that does exactly that.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/update-brew-formulae.sh",
"diff": "+#! /usr/bin/env bash\n+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+# This script takes the new tag as its argument.\n+# Run it from the base directory (tezos-packaging).\n+\n+if [[ -d ./Formula ]]\n+then\n+ regex=\"(v.*)-[0-9]*\"\n+ if [[ $1 =~ $regex ]]; then\n+ tag=\"${BASH_REMATCH[0]}\"\n+ version=\"${BASH_REMATCH[1]}\"\n+ find ./Formula -type f \\( -name 'tezos-*.rb' ! -name 'tezos-sapling-params.rb' \\) \\\n+ -exec sed -i \"s/version \\\"v.*\\\"/version \\\"$tag\\\"/g\" {} \\; \\\n+ -exec sed -i \"s/:tag => \\\"v.*\\\"/:tag => \\\"$version\\\"/g\" {} \\; \\\n+ -exec sed -i \"/catalina/d\" {} \\; \\\n+ -exec sed -i \"/mojave/d\" {} \\;\n+ else\n+ echo \"The argument does not look like a tag, which should have a form of 'v*-[0-9]*'\"\n+ fi\n+else\n+ echo \"Please run this script from the base directory (tezos-packaging).\"\n+fi\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#286] Add script to bump brew versions
Problem: before adding new bottle hashes, we need to update versions
and tags in formulae and clean out old hashes. Currently there is no
way to easily do it automatically.
Solution: added a bash script that does exactly that.
|
603,652
|
22.09.2021 15:48:47
| -10,800
|
fff75692291049677af41f2998aea27b9cc35be9
|
Bump source versions for v11.0-rc1
Problem: Tezos announced a new release. Revisions used have to be
bumped.
Solution: updated versions for Tezos sources.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v10.2\",\n+ \"ref\": \"refs/tags/v11.0-rc1\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"5bfd311b701015381338e73a30c74415fa493c10\",\n+ \"rev\": \"36055190bb560997f377ab7ee7bc6b66fe61835f\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump source versions for v11.0-rc1
Problem: Tezos announced a new release. Revisions used have to be
bumped.
Solution: updated versions for Tezos sources.
|
603,652
|
23.09.2021 11:40:52
| -10,800
|
842fe18729c6b1ecc6112ea232b9e43d6ca86c33
|
Use Ocaml 4.12.0
Problem: Octez is now built with ocaml-4.12.0.
Solution: Use this compiler version as well.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -48,7 +48,7 @@ let\n'';\nin\nrec {\n- ocaml = self.ocaml-ng.ocamlPackages_4_10.ocaml;\n+ ocaml = self.ocaml-ng.ocamlPackages_4_12.ocaml;\ndune = self.ocamlPackages.dune_2;\n# FIXME opam-nix needs to do this\nocamlfind = findlib;\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/ocaml-overlay.nix",
"new_path": "nix/build/ocaml-overlay.nix",
"diff": ", hacks ? import ./hacks.nix\n, pkgs ? import sources.nixpkgs { }, opam-nix ? import sources.opam-nix pkgs }:\nself: super: {\n- ocamlPackages = self.ocaml-ng.ocamlPackages_4_10.overrideScope'\n+ ocamlPackages = self.ocaml-ng.ocamlPackages_4_12.overrideScope'\n(builtins.foldl' self.lib.composeExtensions (_: _: { }) [\n(opam-nix.traverseOPAMRepo' sources.opam-repository)\n(oself: osuper: { index-super = osuper.index.versions.\"1.2.0\"; })\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Use Ocaml 4.12.0
Problem: Octez is now built with ocaml-4.12.0.
Solution: Use this compiler version as well.
|
603,652
|
23.09.2021 11:44:30
| -10,800
|
3d09093898dc5a79d07b7a48436c292dd4a79dde
|
Use tezos/opam-repository fork
Problem: It's inconvenient to manually find suitable versions of the
opam packages in hacks.nix:(
Solutiom: Use tezos/opam-repository fork which has only suitable
versions for all dependencies.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "},\n\"opam-repository\": {\n\"branch\": \"master\",\n- \"description\": \"Main public package repository for OPAM, the source package manager of OCaml.\",\n- \"homepage\": \"https://opam.ocaml.org\",\n- \"owner\": \"ocaml\",\n+ \"description\": \"Tezos opam-repository fork.\",\n+ \"owner\": \"tezos\",\n\"repo\": \"opam-repository\",\n- \"rev\": \"3e92793804b7f34fca09fb17e2ebafd6d29d90cf\",\n- \"sha256\": \"175fdlydmwn6kb09dyz2pz8z2wdsa2lkfys0yqdgv237m67mk2yh\",\n+ \"rev\": \"393349af19bb54e3cb790ac8ef54a72adc71aecf\",\n+ \"sha256\": \"1b89v9488qq0nxjbr249h8mcm6fgz6dyz6ph83gkf3yi83mpqcv0\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/3e92793804b7f34fca09fb17e2ebafd6d29d90cf.tar.gz\",\n- \"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n+ \"url\": \"https://gitlab.com/tezos/opam-repository/-/archive/393349af19bb54e3cb790ac8ef54a72adc71aecf.tar.gz\",\n+ \"url_template\": \"https://gitlab.com/<owner>/<repo>/-/archive/<rev>.tar.gz\"\n},\n\"serokell-nix\": {\n\"branch\": \"master\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Use tezos/opam-repository fork
Problem: It's inconvenient to manually find suitable versions of the
opam packages in hacks.nix:(
Solutiom: Use tezos/opam-repository fork which has only suitable
versions for all dependencies.
|
603,652
|
23.09.2021 11:47:39
| -10,800
|
cee5588d443f5ec4ce86d7f02ea06e79a08c7d91
|
Bump opam-nix
To provide more workarounds required for building.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": null,\n\"owner\": \"serokell\",\n\"repo\": \"opam-nix\",\n- \"rev\": \"bdd7e6730bdf0ea91ada3ebc68387424b087c9f8\",\n- \"sha256\": \"1wda717d6391vbgrp0vcv27pxfj4xy1511mssky8ll3iy7i851hn\",\n+ \"rev\": \"ee285a3b6e05dc274f9ebf59ad64d8a4fded915e\",\n+ \"sha256\": \"0f3dm834zf7y4c4pp8xr12zl0n1xk0zql3a9m2wh6a5shdcdcwj7\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/serokell/opam-nix/archive/bdd7e6730bdf0ea91ada3ebc68387424b087c9f8.tar.gz\",\n+ \"url\": \"https://github.com/serokell/opam-nix/archive/ee285a3b6e05dc274f9ebf59ad64d8a4fded915e.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-repository\": {\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump opam-nix
To provide more workarounds required for building.
|
603,652
|
23.09.2021 11:48:02
| -10,800
|
a7ad3f1d40b72024d8775ad7c410445c253c2b95
|
Adjust hacks.nix
Since opam-repository reference was changed.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -53,62 +53,30 @@ rec {\n# FIXME opam-nix needs to do this\nocamlfind = findlib;\n- # FIXME opam-nix needs to do version resolution\n- ezjsonm = osuper.ezjsonm.versions.\"1.2.0\";\n- hacl-star-raw = osuper.hacl-star-raw.versions.\"0.3.2\".overrideAttrs (o: rec {\n+ hacl-star-raw = osuper.hacl-star-raw.versions.\"0.4.1\".overrideAttrs (o: rec {\npreConfigure = \"patchShebangs raw/configure\";\nsourceRoot = \".\";\nbuildInputs = o.buildInputs ++ [ self.which ];\n- propagatedBuildInputs = buildInputs;\nminimalOCamlVersion = \"4.10\";\n});\n- hacl-star = osuper.hacl-star.versions.\"0.3.2\".overrideAttrs (_: rec {\n+ hacl-star = osuper.hacl-star.versions.\"0.4.1\".overrideAttrs (o: rec {\nsourceRoot = \".\";\n- });\n- optint = osuper.optint.versions.\"0.1.0\";\n- repr = osuper.repr.overrideAttrs (o: rec {\n- version = \"0.4.0\";\n- src = self.fetchurl {\n- url = \"https://github.com/mirage/${o.pname}/releases/download/${version}/${o.pname}-fuzz-${version}.tbz\";\n- sha256 = \"1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p\";\n- };\n- });\n- ppx_repr = osuper.ppx_repr.overrideAttrs (_: {\n- doCheck = false;\n- });\n- terminal = osuper.terminal.versions.\"0.2.1\".overrideAttrs (o: {\nbuildPhase = ''\nrunHook preBuild\n- \"dune\" \"build\" \"-p\" \"${o.pname}\" \"-j\" \"$NIX_BUILD_CORES\"\n+ dune build -p hacl-star -j $NIX_BUILD_CORES @install @doc\nrunHook postBuild\n'';\n});\n- progress = osuper.progress.versions.\"0.2.1\".overrideAttrs (o: {\n- buildPhase = ''\n- runHook preBuild\n- \"dune\" \"build\" \"-p\" \"${o.pname}\" \"-j\" \"$NIX_BUILD_CORES\"\n- runHook postBuild\n- '';\n- });\n- index = osuper.index.versions.\"1.4.1\";\n- ppx_irmin = osuper.ppx_irmin.versions.\"2.7.2\";\n- irmin = osuper.irmin.versions.\"2.7.2\";\n- irmin-pack = osuper.irmin-pack.versions.\"2.7.2\";\n- irmin-layers = osuper.irmin-layers.versions.\"2.7.2\";\nlwt-canceler = osuper.lwt-canceler.versions.\"0.3\";\n-\n- benchmark = osuper.benchmark.overrideAttrs (_: {\n- doCheck = false;\n+ data-encoding = osuper.data-encoding.versions.\"0.4\";\n+ json-data-encoding = osuper.json-data-encoding.versions.\"0.10\";\n+ json-data-encoding-bson = osuper.json-data-encoding-bson.versions.\"0.10\";\n+ ocamlformat = osuper.ocamlformat.overrideAttrs (o: {\n+ buildInputs = o.buildInputs ++ [ alcotest ocp-indent ];\n});\n- data-encoding = osuper.data-encoding.versions.\"0.3\";\n- json-data-encoding = osuper.json-data-encoding.versions.\"0.9.1\";\n- json-data-encoding-bson = osuper.json-data-encoding-bson.versions.\"0.9.1\";\n- ff = osuper.ff.versions.\"0.4.0\";\n-\n- bls12-381-gen = osuper.bls12-381-gen.versions.\"0.4.3\";\n- bls12-381 = osuper.bls12-381.versions.\"0.4.3\".overrideAttrs (o:\n+ bls12-381 = osuper.bls12-381.versions.\"1.0.0\".overrideAttrs (o:\nrec {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\nbuildPhase = ''\n@@ -116,11 +84,16 @@ rec {\n'' + o.buildPhase;\n});\n- bls12-381-unix = osuper.bls12-381-unix.versions.\"0.4.3\".overrideAttrs (o:\n+ bls12-381-unix = osuper.bls12-381-unix.overrideAttrs (o:\n+ rec {\n+ buildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\n+ });\n+\n+ bls12-381-legacy = osuper.bls12-381-legacy.overrideAttrs (o:\nrec {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\nbuildPhase = ''\n- cp ${rustc-bls12-381.src}/include/* src/unix/\n+ cp ${rustc-bls12-381.src}/include/* src/legacy/\n'' + o.buildPhase;\n});\n@@ -133,15 +106,14 @@ rec {\n}\n);\nzarith = osuper.zarith.overrideAttrs(o : {\n- version = \"1.10\";\n+ version = \"1.11\";\nbuildInputs = o.buildInputs ++ [self.perl];\nsrc = self.fetchurl {\n- url = \"https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz\";\n- sha256 = \"1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb\";\n+ url = \"https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz\";\n+ sha256 = \"111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr\";\n};\npatchPhase = \"patchShebangs ./z_pp.pl\";\n});\n-\n# FIXME opam-nix needs to handle \"external\" (native) dependencies correctly\nconf-gmp = self.gmp;\nconf-libev = self.libev;\n@@ -157,37 +129,6 @@ rec {\nctypes-foreign = ctypes;\ngmp = self.gmp;\n- zlib = osuper.zlib.overrideAttrs (o: {\n- src = self.fetchurl {\n- url = \" https://github.com/madroach/ocaml-zlib/archive/0.6.tar.gz\";\n- sha256 = \"sha256-QWc8Lrk8qZ7T3hg77z5rQ2xnoNkCsRC+XaFXqtkip+k=\";\n- };\n- });\n- camlzip = osuper.camlzip.versions.\"1.10\".overrideAttrs (_: {\n- src = self.fetchzip {\n- url = \"https://github.com/xavierleroy/camlzip/archive/rel110.zip\";\n- sha256 = \"1pm1vs947cbb4b4827pcz5kbj41miyxw599craznwm1ix27bmpj6\";\n- };\n- });\n-\n- ctypes = osuper.ctypes.versions.\"0.17.1\".overrideAttrs (o: rec{\n- pname = \"ctypes\";\n- buildInputs = o.buildInputs ++ [ self.libffi ];\n- src = self.fetchurl {\n- url = \"https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz\";\n- sha256 = \"sha256-QWc8Lrk8qZ7T3hg77z5rQ2xnoNkCsRC+XaFYqtkip+k=\";\n- };\n- installPhase = ''\n- runHook preInstall\n- mkdir -p $OCAMLFIND_DESTDIR\n- \"make\" \"install\"\n- if [[ -d $OCAMLFIND_DESTDIR/${pname} ]]; then mv $OCAMLFIND_DESTDIR/${pname} $lib; ln -s $lib $OCAMLFIND_DESTDIR/${pname}; else touch $lib; fi\n- if [[ -d $out/bin ]]; then mv $out/bin $bin; ln -s $bin $out/bin; else touch $bin; fi\n- if [[ -d $out/share ]]; then mv $out/share $share; ln -s $share $out/share; else touch $share; fi\n- runHook postInstall\n- '';\n- });\n-\n# FIXME X11 in nixpkgs musl\nlablgtk = null;\n@@ -199,6 +140,11 @@ rec {\npropagatedBuildInputs = buildInputs;\n});\n+ tezos-protocol-environment-structs = osuper.tezos-protocol-environment-structs.overrideAttrs (o: rec {\n+ buildInputs = o.buildInputs ++ [ bls12-381-legacy ];\n+ propagatedBuildInputs = buildInputs;\n+ });\n+\ntezos-client-base-unix = osuper.tezos-client-base-unix.overrideAttrs (o: rec {\nbuildInputs = o.buildInputs ++\n[ lwt-exit tezos-shell-services tezos-signer-backends tezos-proxy\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjust hacks.nix
Since opam-repository reference was changed.
|
603,652
|
23.09.2021 12:26:16
| -10,800
|
be989ed678a3786bb8ea5015e1fbf4663e400158
|
Update brew formulae for v11.0-rc1
Problem: Tezos announced a new release. We need to update the brew
bottles.
Solution: bumped the versions, removed 10.2 bottles hashes.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAccuser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosAccuser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/\"\n- sha256 cellar: :any, mojave: \"4ba3a76ae7db229c432039a84a2ca55fbdf93e37d49419201b81d96964eaf18a\"\n- sha256 cellar: :any, catalina: \"35659c58f1df616e046b836fa239a9d4b8ff47db954577606930c295d59146da\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosAccuser010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosAdminClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n- sha256 cellar: :any, mojave: \"13d05a8d96a584d1b97e80289e39ead20a57188fa9814eab4d075f22a0642ba4\"\n- sha256 cellar: :any, catalina: \"c431c23f6b92d8690be76b5135ae1d8569017e3a4c4b01f0aa020d51ddbc6e8b\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosAdminClient < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosBaker010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\n- sha256 cellar: :any, mojave: \"83402ddc80e97fbc6bfc23721776f3db8419f754da62b57aff544180320fb850\"\n- sha256 cellar: :any, catalina: \"f5846339abc701c3a65524c62eb70a41b0c354ffde5e6601cde3693024e50460\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosBaker010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosClient < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n- sha256 cellar: :any, mojave: \"654ffbc594b11f563e97119af2aeb304d5a1351625ea2aa3648d1e253ee2d58a\"\n- sha256 cellar: :any, catalina: \"340b4a52e21a15b7f52c7785179c4226d6a8bc6957f12ba6f5ffb2455e150706\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosClient < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosCodec < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n- sha256 cellar: :any, mojave: \"864e31f9720ceda7d1075e5282eb89aadb57e79903a1c950909be5538d0588a9\"\n- sha256 cellar: :any, catalina: \"6234e4ecc9453179b4393840459302214acb10661631f96558c0bb68ff31c9ac\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosCodec < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosEndorser010Ptgranad < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -28,8 +28,6 @@ class TezosEndorser010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/\"\n- sha256 cellar: :any, mojave: \"a047be8cec6b9a03511313a55906462f9e1313efcf787f1b1072288b1d444a09\"\n- sha256 cellar: :any, catalina: \"c604ffec47910372a3a0c6442fa7090924d4d41eb64c5e1e00fef8c0068c9fc9\"\nend\ndef make_deps\n@@ -39,7 +37,7 @@ class TezosEndorser010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-granadanet.rb",
"new_path": "Formula/tezos-node-granadanet.rb",
"diff": "class TezosNodeGranadanet < Formula\nurl \"file:///dev/null\"\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "class TezosNodeMainnet < Formula\nurl \"file:///dev/null\"\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosNode < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n- sha256 cellar: :any, mojave: \"357de6612ea77969189d4f6ea4aa2c50caffcfd6170a3a8c2179c36ccf7f27aa\"\n- sha256 cellar: :any, catalina: \"48d629b964558f0831420d119699b8aaeed5b2397206946a6e5737f3ed4fb1e7\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosNode < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSandbox < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n- sha256 cellar: :any, mojave: \"536f9184499a3fb993d510de1e88f3e09e2c161d64920f9f1875369d73150e72\"\n- sha256 cellar: :any, catalina: \"92e1d3123a088e3c897e9bf2f9ed1445007025015ad65c16ea8ea0b83706314c\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosSandbox < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "class TezosSignerHttp < Formula\nurl \"file:///dev/null\"\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "class TezosSignerHttps < Formula\nurl \"file:///dev/null\"\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "class TezosSignerTcp < Formula\nurl \"file:///dev/null\"\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "class TezosSignerUnix < Formula\nurl \"file:///dev/null\"\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -10,9 +10,9 @@ class TezosSigner < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v10.2\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0-rc1\", :shallow => false\n- version \"v10.2-1\"\n+ version \"v11.0-rc1-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n- sha256 cellar: :any, mojave: \"9f4feec8809d70275f42c65055f0374f8895a6a35d4f2da65d09e2498547c6a8\"\n- sha256 cellar: :any, catalina: \"c3ea1246af5ed67feed4fe4bc57bed3bee879ee8b3af180fe80f98f1f2861558\"\nend\ndef make_deps\n@@ -38,7 +36,7 @@ class TezosSigner < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update brew formulae for v11.0-rc1
Problem: Tezos announced a new release. We need to update the brew
bottles.
Solution: bumped the versions, removed 10.2 bottles hashes.
|
603,652
|
24.09.2021 13:04:43
| -10,800
|
02f01e66ba707aca684295b9371628a6f5e2c20e
|
Compile Ubuntu packages with -fPIC
Problem: This compiler option isn't enabled by default and as a result
the compilation of bls12-381-unix fails.
Solution: Add -fPIC to the c compiler flags.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -172,6 +172,8 @@ def gen_systemd_rules_contents(package):\noverride_dh_install_init += f\" dh_installinit --name={unit_name}\\n\"\nrules_contents = f\"\"\"#!/usr/bin/make -f\n+export DEB_CFLAGS_APPEND=-fPIC\n+\n%:\ndh $@ {\"--with systemd\" if len(package.systemd_units) > 0 else \"\"}\noverride_dh_systemd_start:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Compile Ubuntu packages with -fPIC
Problem: This compiler option isn't enabled by default and as a result
the compilation of bls12-381-unix fails.
Solution: Add -fPIC to the c compiler flags.
|
603,652
|
24.09.2021 13:06:52
| -10,800
|
cb31cc69c598a409cf0d76dbc42ae9b947252d23
|
Don't use '-' in Fedora packages versions
Problem: 'rpm' prohibits '-' symbol in the version field.
Solution: Remove dash from the v11.0-rc1 and use v11.0rc1 version
instead.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/fedora.py",
"new_path": "docker/package/fedora.py",
"diff": "@@ -15,7 +15,8 @@ def build_fedora_package(\nrun_deps: List[str],\nis_source: bool,\n):\n- dir = f\"{pkg.name}-{pkg.meta.version}\"\n+ version = pkg.meta.version.replace(\"-\", \"\")\n+ dir = f\"{pkg.name}-{version}\"\ncwd = os.path.dirname(__file__)\nhome = os.environ[\"HOME\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -266,17 +266,18 @@ Description: {self.desc}\nsystemd_files,\nsystemd_macros,\n) = gen_spec_systemd_part(self)\n+ version = self.meta.version.replace(\"-\", \"\")\nfile_contents = f\"\"\"\n%define debug_package %{{nil}}\nName: {self.name}\n-Version: {self.meta.version}\n+Version: {version}\nRelease: {self.meta.release}\nEpoch: {self.meta.fedora_epoch}\nSummary: {self.desc}\nLicense: MIT\nBuildArch: x86_64 aarch64\n-Source0: {self.name}-{self.meta.version}.tar.gz\n+Source0: {self.name}-{version}.tar.gz\nSource1: https://gitlab.com/tezos/tezos/tree/v{self.meta.version}/\nBuildRequires: {build_requires} {systemd_deps}\nRequires: {requires}, {str_additional_native_deps}\n@@ -406,16 +407,17 @@ Description: {self.desc}\nf.write(file_contents)\ndef gen_spec_file(self, build_deps, run_deps, out):\n+ version = self.meta.version.replace(\"-\", \"\")\nfile_contents = f\"\"\"\n%define debug_package %{{nil}}\nName: {self.name}\n-Version: {self.meta.version}\n+Version: {version}\nRelease: {self.meta.release}\nEpoch: {self.meta.fedora_epoch}\nSummary: {self.desc}\nLicense: MIT\nBuildArch: x86_64 aarch64\n-Source0: {self.name}-{self.meta.version}.tar.gz\n+Source0: {self.name}-{version}.tar.gz\nBuildRequires: wget\n%description\n{self.desc}\n@@ -580,16 +582,17 @@ Description: {self.desc}\nsystemd_files,\nsystemd_macros,\n) = gen_spec_systemd_part(self)\n+ version = self.meta.version.replace(\"-\", \"\")\nfile_contents = f\"\"\"\n%define debug_package %{{nil}}\nName: {self.name}\n-Version: {self.meta.version}\n+Version: {version}\nRelease: {self.meta.release}\nEpoch: {self.meta.fedora_epoch}\nSummary: {self.desc}\nLicense: MIT\nBuildArch: x86_64 aarch64\n-Source0: {self.name}-{self.meta.version}.tar.gz\n+Source0: {self.name}-{version}.tar.gz\nSource1: https://gitlab.com/tezos/tezos/tree/v{self.meta.version}/\nBuildRequires: {systemd_deps}\nRequires: {run_deps}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Don't use '-' in Fedora packages versions
Problem: 'rpm' prohibits '-' symbol in the version field.
Solution: Remove dash from the v11.0-rc1 and use v11.0rc1 version
instead.
|
603,652
|
01.10.2021 16:29:50
| -10,800
|
671e01c114051487fd2fd96fae53d98d1f204a4f
|
Mention release-candidate packages in instuctions
Problem: Now we provide packages with release-candidate Tezos binaries,
we should explain how users may install them.
Solution: Mention launchpad PPA and Copr project with release-candidate
packages in the corresponding docs.
|
[
{
"change_type": "MODIFY",
"old_path": "docs/baking.md",
"new_path": "docs/baking.md",
"diff": "@@ -54,6 +54,12 @@ On Ubuntu:\nsudo add-apt-repository ppa:serokell/tezos\n```\n+Alternatively, use packages with release-candidate Tezos binaries:\n+```\n+# Or use PPA with release-candidate Tezos binaries\n+sudo add-apt-repository ppa:serokell/tezos\n+```\n+\nOn Raspberry Pi OS:\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/distros/fedora.md",
"new_path": "docs/distros/fedora.md",
"diff": "@@ -20,6 +20,18 @@ sudo yum install tezos-baker-010-PtGRANAD\n```\nOnce you install such packages the commands `tezos-*` will be available.\n+## Using release-candidate packages\n+\n+In order to use packages with the latest release-candidate Tezos binaries,\n+use `@Serokell/Tezos-rc` project:\n+```\n+# use dnf\n+sudo dnf copr enable @Serokell/Tezos-rc\n+\n+# or use yum\n+sudo yum copr enable @Serokell/Tezos-rc\n+```\n+\n## Systemd services from Fedora packages\nSome of the packages provide background `systemd` services, you can read more about them\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/distros/ubuntu.md",
"new_path": "docs/distros/ubuntu.md",
"diff": "@@ -16,6 +16,14 @@ sudo apt-get install tezos-baker-010-ptgranad\n```\nOnce you install such packages the commands `tezos-*` will be available.\n+## Using release-candidate packages\n+\n+In order to use packages with the latest release-candidate Tezos binaries,\n+use `ppa:serokell/tezos-rc` PPA:\n+```\n+sudo add-apt-repository ppa:serokell/tezos-rc && sudo apt-get update\n+```\n+\n## `tezos-baking` package\nAs an addition, `tezos-baking` package provides `tezos-baking-<network>` services that orchestrate\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Mention release-candidate packages in instuctions
Problem: Now we provide packages with release-candidate Tezos binaries,
we should explain how users may install them.
Solution: Mention launchpad PPA and Copr project with release-candidate
packages in the corresponding docs.
|
603,650
|
04.10.2021 12:57:02
| -7,200
|
11ca8cdf5f8275db28bd2bd2ac11f7a693f9e0d6
|
[Chore] Fix URL for Ubuntu's RCs PPA in docs
Problem: the URL in the baking doc instruction's command,
to use the PPA for release candidates, is incorrect.
Solution: update the URL.
|
[
{
"change_type": "MODIFY",
"old_path": "docs/baking.md",
"new_path": "docs/baking.md",
"diff": "@@ -57,7 +57,7 @@ sudo add-apt-repository ppa:serokell/tezos\nAlternatively, use packages with release-candidate Tezos binaries:\n```\n# Or use PPA with release-candidate Tezos binaries\n-sudo add-apt-repository ppa:serokell/tezos\n+sudo add-apt-repository ppa:serokell/tezos-rc\n```\nOn Raspberry Pi OS:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix URL for Ubuntu's RCs PPA in docs
Problem: the URL in the baking doc instruction's command,
to use the PPA for release candidates, is incorrect.
Solution: update the URL.
|
603,652
|
04.10.2021 12:04:21
| -10,800
|
51cce0ab7c44389fd6e7a5873c4c4bbea6e16f9d
|
Check for new releases in CI
Problem: We want CI to create initial release PRs automatically.
Solution: Add a scheduled job to the tags-related CI setup which will
run the script for the initial release PR creation every given period of
time.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-for-tags.yml",
"new_path": ".buildkite/pipeline-for-tags.yml",
"diff": "@@ -51,3 +51,8 @@ steps:\n- buildkite-agent artifact download --step build-bottles \"*\" .\n- nix-shell ./scripts/shell.nix\n--run 'gh release upload \"$BUILDKITE_TAG\" *.bottle.*'\n+\n+ - label: Check for new Tezos release\n+ if: build.source == \"schedule\" && build.branch == \"master\"\n+ commands:\n+ - nix-shell ./scripts/shell.nix --run ./scripts/update-tezos.sh\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shell.nix",
"new_path": "scripts/shell.nix",
"diff": "{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs { } }:\nwith pkgs;\nmkShell {\n- buildInputs = [ coreutils gnused gh git rename gnupg dput rpm debian-devscripts which util-linux perl ];\n+ buildInputs = [\n+ coreutils gnused gh git rename gnupg dput rpm debian-devscripts which util-linux perl\n+ jq niv\n+ ];\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#288] Check for new releases in CI
Problem: We want CI to create initial release PRs automatically.
Solution: Add a scheduled job to the tags-related CI setup which will
run the script for the initial release PR creation every given period of
time.
|
603,652
|
04.10.2021 12:53:58
| -10,800
|
20c4e74ddb64ee605881d0246000ad5603160d35
|
[Chore] Fix opam-repository definition in sources.json
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-repository\": {\n- \"branch\": \"master\",\n- \"description\": \"Tezos opam-repository fork.\",\n- \"owner\": \"tezos\",\n- \"repo\": \"opam-repository\",\n+ \"ref\": \"master\",\n+ \"repo\": \"https://gitlab.com/tezos/opam-repository\",\n\"rev\": \"393349af19bb54e3cb790ac8ef54a72adc71aecf\",\n- \"sha256\": \"1b89v9488qq0nxjbr249h8mcm6fgz6dyz6ph83gkf3yi83mpqcv0\",\n- \"type\": \"tarball\",\n- \"url\": \"https://gitlab.com/tezos/opam-repository/-/archive/393349af19bb54e3cb790ac8ef54a72adc71aecf.tar.gz\",\n- \"url_template\": \"https://gitlab.com/<owner>/<repo>/-/archive/<rev>.tar.gz\"\n+ \"type\": \"git\"\n},\n\"serokell-nix\": {\n\"branch\": \"master\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix opam-repository definition in sources.json
|
603,652
|
22.10.2021 19:37:56
| -10,800
|
2826f736ce970d6d4fb665b1e10ba4033bde2c5f
|
Adjust hacks.nix
Backport used compiler version and fix some libraries versions as always.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -48,19 +48,20 @@ let\n'';\nin\nrec {\n- ocaml = self.ocaml-ng.ocamlPackages_4_12.ocaml;\n+ ocaml = self.ocaml-ng.ocamlPackages_4_10.ocaml;\ndune = self.ocamlPackages.dune_2;\n# FIXME opam-nix needs to do this\nocamlfind = findlib;\n- hacl-star-raw = osuper.hacl-star-raw.versions.\"0.4.1\".overrideAttrs (o: rec {\n+ hacl-star-raw = osuper.hacl-star-raw.versions.\"0.3.2\".overrideAttrs (o: rec {\npreConfigure = \"patchShebangs raw/configure\";\nsourceRoot = \".\";\nbuildInputs = o.buildInputs ++ [ self.which ];\nminimalOCamlVersion = \"4.10\";\n});\n- hacl-star = osuper.hacl-star.versions.\"0.4.1\".overrideAttrs (o: rec {\n+ hacl-star = osuper.hacl-star.versions.\"0.3.2\".overrideAttrs (o: rec {\nsourceRoot = \".\";\n+ buildInputs = o.buildInputs ++ [ odoc ];\nbuildPhase = ''\nrunHook preBuild\ndune build -p hacl-star -j $NIX_BUILD_CORES @install @doc\n@@ -69,14 +70,14 @@ rec {\n});\nlwt-canceler = osuper.lwt-canceler.versions.\"0.3\";\n- data-encoding = osuper.data-encoding.versions.\"0.4\";\n- json-data-encoding = osuper.json-data-encoding.versions.\"0.10\";\n- json-data-encoding-bson = osuper.json-data-encoding-bson.versions.\"0.10\";\n+ data-encoding = osuper.data-encoding.versions.\"0.3\";\n+ json-data-encoding = osuper.json-data-encoding.versions.\"0.9.1\";\n+ json-data-encoding-bson = osuper.json-data-encoding-bson.versions.\"0.9.1\";\nocamlformat = osuper.ocamlformat.overrideAttrs (o: {\nbuildInputs = o.buildInputs ++ [ alcotest ocp-indent ];\n});\n- bls12-381 = osuper.bls12-381.versions.\"1.0.0\".overrideAttrs (o:\n+ bls12-381 = osuper.bls12-381.versions.\"0.4.3\".overrideAttrs (o:\nrec {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\nbuildPhase = ''\n@@ -84,16 +85,11 @@ rec {\n'' + o.buildPhase;\n});\n- bls12-381-unix = osuper.bls12-381-unix.overrideAttrs (o:\n- rec {\n- buildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\n- });\n-\n- bls12-381-legacy = osuper.bls12-381-legacy.overrideAttrs (o:\n+ bls12-381-unix = osuper.bls12-381-unix.versions.\"0.4.3\".overrideAttrs (o:\nrec {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\nbuildPhase = ''\n- cp ${rustc-bls12-381.src}/include/* src/legacy/\n+ cp ${rustc-bls12-381.src}/include/* src/unix\n'' + o.buildPhase;\n});\n@@ -141,7 +137,7 @@ rec {\n});\ntezos-protocol-environment-structs = osuper.tezos-protocol-environment-structs.overrideAttrs (o: rec {\n- buildInputs = o.buildInputs ++ [ bls12-381-legacy ];\n+ buildInputs = o.buildInputs ++ [ ];\npropagatedBuildInputs = buildInputs;\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/ocaml-overlay.nix",
"new_path": "nix/build/ocaml-overlay.nix",
"diff": ", hacks ? import ./hacks.nix\n, pkgs ? import sources.nixpkgs { }, opam-nix ? import sources.opam-nix pkgs }:\nself: super: {\n- ocamlPackages = self.ocaml-ng.ocamlPackages_4_12.overrideScope'\n+ ocamlPackages = self.ocaml-ng.ocamlPackages_4_10.overrideScope'\n(builtins.foldl' self.lib.composeExtensions (_: _: { }) [\n(opam-nix.traverseOPAMRepo' sources.opam-repository)\n(oself: osuper: { index-super = osuper.index.versions.\"1.2.0\"; })\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjust hacks.nix
Backport used compiler version and fix some libraries versions as always.
|
603,652
|
25.10.2021 10:38:01
| -10,800
|
50a050e52e1ad6ad7e94926bb1a603ae3818e81c
|
Adjust static_libs.patch
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+diff --git a/src/bin_client/dune b/src/bin_client/dune\n+index 00fb3a632..923739d2b 100644\n+--- a/src/bin_client/dune\n++++ b/src/bin_client/dune\n+@@ -76,7 +76,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_mockup_commands\n+ -open Tezos_client_base_unix\n+- -linkall)))\n++ -linkall\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+\n+ (rule\n+ (action\n+diff --git a/src/bin_codec/dune b/src/bin_codec/dune\n+index f7577c4e5..949d2cbc4 100644\n+--- a/src/bin_codec/dune\n++++ b/src/bin_codec/dune\n+@@ -33,7 +33,9 @@\n+ -open Tezos_clic\n+ -open Tezos_stdlib_unix\n+ -open Tezos_event_logging\n+- -linkall)))\n++ -linkall\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+\n+ (rule\n+ (action\n+diff --git a/src/bin_node/dune b/src/bin_node/dune\n+index 95a8d1af7..ce2ac8e3e 100644\n+--- a/src/bin_node/dune\n++++ b/src/bin_node/dune\n+@@ -96,7 +96,8 @@\n+ -open Tezos_shell_context\n+ -open Tezos_workers\n+ -open Tezos_protocol_updater\n+- -linkall)))\n++ -linkall\n++ -ccopt -static)))\n+\n+ (rule\n+ (action\n+diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n+index 26c1fa638..029a50c07 100644\n+--- a/src/bin_signer/dune\n++++ b/src/bin_signer/dune\n+@@ -21,4 +21,6 @@\n+ -open Tezos_rpc_http_server\n+ -open Tezos_rpc_http_client_unix\n+ -open Tezos_stdlib_unix\n+- -open Tezos_stdlib)))\n++ -open Tezos_stdlib\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+diff --git a/src/proto_010_PtGRANAD/bin_accuser/dune b/src/proto_010_PtGRANAD/bin_accuser/dune\n+index 11c77973e3..43515f16ed 100644\n+--- a/src/proto_010_PtGRANAD/bin_accuser/dune\n++++ b/src/proto_010_PtGRANAD/bin_accuser/dune\n+@@ -10,4 +10,6 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_010_PtGRANAD_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+diff --git a/src/proto_010_PtGRANAD/bin_baker/dune b/src/proto_010_PtGRANAD/bin_baker/dune\n+index 0535edf13c..f0c85ad447 100644\n+--- a/src/proto_010_PtGRANAD/bin_baker/dune\n++++ b/src/proto_010_PtGRANAD/bin_baker/dune\n+@@ -10,4 +10,6 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_010_PtGRANAD_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+diff --git a/src/proto_010_PtGRANAD/bin_endorser/dune b/src/proto_010_PtGRANAD/bin_endorser/dune\n+index c19a310a8f..6c38226293 100644\n+--- a/src/proto_010_PtGRANAD/bin_endorser/dune\n++++ b/src/proto_010_PtGRANAD/bin_endorser/dune\n+@@ -10,4 +10,6 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_010_PtGRANAD_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\ndiff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\n-index ef3f1196e6..48be78fdb3 100644\n+index 6289c6d124..aa2eb20a29 100644\n--- a/src/bin_sandbox/dune\n+++ b/src/bin_sandbox/dune\n-@@ -2,4 +2,5 @@\n- (names main)\n+@@ -3,4 +3,4 @@\n(libraries tezos-base\ntezos-base.unix\n-- flextesa))\n-+ flextesa)\n+ flextesa)\n+- (flags :standard))\n+ (flags :standard -ccopt -static))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjust static_libs.patch
|
603,652
|
25.10.2021 11:39:26
| -10,800
|
5ba8171777095f4dcd4f5aa83fd612ae0a0ee4eb
|
Decrease used rust version
To match the recommended version for the v10.3 release.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosAccuser010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosAdminClient < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosBaker010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosClient < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosCodec < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -37,7 +37,7 @@ class TezosEndorser010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosNode < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosSandbox < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosSigner < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/build/build-tezos.sh",
"new_path": "docker/build/build-tezos.sh",
"diff": "@@ -14,10 +14,12 @@ cd tezos\ngit apply ../static.patch\nexport OPAMYES=\"true\"\n-wget https://sh.rustup.rs/rustup-init.sh\n-chmod +x rustup-init.sh\n-./rustup-init.sh --profile minimal --default-toolchain 1.52.1 -y\n-source \"$HOME/.cargo/env\"\n+# Alpine 3.12 already provides rust with required version\n+# Uncomment and adjust when another version is required by Tezos\n+# wget https://sh.rustup.rs/rustup-init.sh\n+# chmod +x rustup-init.sh\n+# ./rustup-init.sh --profile minimal --default-toolchain 1.52.1 -y\n+# source \"$HOME/.cargo/env\"\nopam init --bare --disable-sandboxing\nmake build-deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Decrease used rust version
To match the recommended version for the v10.3 release.
|
603,652
|
25.10.2021 13:08:36
| -10,800
|
272dc19a7ce97c8c7892406c333879c086d79d34
|
Fix static build script
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/build-tezos.sh",
"new_path": "docker/build/build-tezos.sh",
"diff": "@@ -23,5 +23,5 @@ export OPAMYES=\"true\"\nopam init --bare --disable-sandboxing\nmake build-deps\n-eval \"$(opam env)\" && PROFILE=\"static\" make build && make build-sandbox\n+eval \"$(opam env)\" && PROFILE=\"static\" make && make build-sandbox\nchmod +w tezos-*\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix static build script
|
603,652
|
25.10.2021 14:57:07
| -10,800
|
369e1313511b287847ae5d0ba10395e9eef8b7b3
|
Fetch opam-repository branch
Problem: Tezos release may use revision from non-master branch in the
opam-repository.
Solution: Fetch the branch name from which the commit is taken from and
use it in the 'niv' call.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/update-tezos.sh",
"new_path": "scripts/update-tezos.sh",
"diff": "@@ -22,6 +22,10 @@ source scripts/version.sh\ncd ..\nrm -rf upstream-repo\n+git clone --bare https://gitlab.com/tezos/opam-repository.git upstream-opam-repository\n+opam_repository_branch=\"$(git --git-dir=upstream-opam-repository name-rev --name-only \"$opam_repository_tag\" | cut -d'/' -f3)\"\n+rm -rf upstream-opam-repository\n+\nbranch_name=\"auto/$latest_upstream_tag-release\"\nour_tezos_tag=\"$(jq -r '.tezos.ref' nix/nix/sources.json | cut -d'/' -f3)\"\n@@ -34,7 +38,7 @@ if [[ \"$latest_upstream_tag\" != \"$our_tezos_tag\" ]]; then\necho \"Updating Tezos to $latest_upstream_tag\"\ncd nix\nniv update tezos -a ref=\"refs/tags/$latest_upstream_tag\" -a rev=\"$latest_upstream_tag_hash\"\n- niv update opam-repository -a rev=\"$opam_repository_tag\"\n+ niv update opam-repository -a rev=\"$opam_repository_tag\" -a ref=\"$opam_repository_branch\" -b \"$opam_repository_branch\"\ngit commit -a -m \"[Chore] Bump Tezos sources to $latest_upstream_tag\"\ncd ..\n./scripts/update-brew-formulae.sh \"$latest_upstream_tag-1\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#288] Fetch opam-repository branch
Problem: Tezos release may use revision from non-master branch in the
opam-repository.
Solution: Fetch the branch name from which the commit is taken from and
use it in the 'niv' call.
|
603,652
|
25.10.2021 14:58:12
| -10,800
|
22c7c6f7641a4b46c0ea7100901683807cc6992a
|
Hotfix for existing branch check
Problem: There is a bug which makes the condition that checks if a
branch for updated already exists is always met.
Solution: Fix that condition.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/update-tezos.sh",
"new_path": "scripts/update-tezos.sh",
"diff": "@@ -33,7 +33,7 @@ our_tezos_tag=\"$(jq -r '.tezos.ref' nix/nix/sources.json | cut -d'/' -f3)\"\nif [[ \"$latest_upstream_tag\" != \"$our_tezos_tag\" ]]; then\n# If corresponding branch doesn't exist yet, then the release PR\n# wasn't created\n- if ! git rev-parse --verify branch_name; then\n+ if ! git rev-parse --verify \"$branch_name\"; then\ngit switch -c \"$branch_name\"\necho \"Updating Tezos to $latest_upstream_tag\"\ncd nix\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#288] Hotfix for existing branch check
Problem: There is a bug which makes the condition that checks if a
branch for updated already exists is always met.
Solution: Fix that condition.
|
603,652
|
26.10.2021 15:14:14
| -10,800
|
a4241488bfd54bdf7021cae4ef1de91f56474650
|
[Chore] Sign commits in CI
Problem: Our repo settings require all commits in PRs to be signed.
Solution: Sign commits created by the CI using the same key that is used
for the package and artifacts signing.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/sync-bottle-hashes.sh",
"new_path": "scripts/sync-bottle-hashes.sh",
"diff": "-#! /usr/bin/env bash\n+#! /usr/bin/env nix-shell\n+#! nix-shell shell.nix -i bash\n# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n@@ -14,7 +15,7 @@ if [ -z \"$1\" ] || [ -z \"$2\" ]; then\nfi\ngit config user.name \"Serokell CI bot\" # necessary for pushing\n-git config user.email \"hi@serokell.io\"\n+git config user.email \"tezos-packaging@serokell.io\" # this address matches the one that is used for signing packages\ngit fetch --all\nbranch_name=\"auto/update-brew-formulae-$1\"\n@@ -31,7 +32,7 @@ while : ; do\ngit fetch --all\ngit reset --hard origin/\"$branch_name\"\n./scripts/bottle-hashes.sh .\n- git commit -a -m \"[Chore] Add $1 hashes to brew formulae\"\n+ git commit -a -m \"[Chore] Add $1 hashes to brew formulae\" --gpg-sign=\"tezos-packaging@serokell.io\"\n! git push || break\ndone\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/update-tezos.sh",
"new_path": "scripts/update-tezos.sh",
"diff": "-#! /usr/bin/env bash\n+#! /usr/bin/env nix-shell\n+#! nix-shell shell.nix -i bash\n# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\nset -e\ngit config user.name \"Serokell CI bot\" # necessary for pushing\n-git config user.email \"hi@serokell.io\"\n+git config user.email \"tezos-packaging@serokell.io\" # this address matches the one that is used for signing packages\ngit fetch --all\n# Get latest tag from tezos/tezos\n@@ -39,10 +40,10 @@ if [[ \"$latest_upstream_tag\" != \"$our_tezos_tag\" ]]; then\ncd nix\nniv update tezos -a ref=\"refs/tags/$latest_upstream_tag\" -a rev=\"$latest_upstream_tag_hash\"\nniv update opam-repository -a rev=\"$opam_repository_tag\" -a ref=\"$opam_repository_branch\" -b \"$opam_repository_branch\"\n- git commit -a -m \"[Chore] Bump Tezos sources to $latest_upstream_tag\"\n+ git commit -a -m \"[Chore] Bump Tezos sources to $latest_upstream_tag\" --gpg-sign=\"tezos-packaging@serokell.io\"\ncd ..\n./scripts/update-brew-formulae.sh \"$latest_upstream_tag-1\"\n- git commit -a -m \"[Chore] Update brew formulae for $latest_upstream_tag\"\n+ git commit -a -m \"[Chore] Update brew formulae for $latest_upstream_tag\" --gpg-sign=\"tezos-packaging@serokell.io\"\ngit push --set-upstream origin \"$branch_name\"\ngh pr create -B master -t \"[Chore] $latest_upstream_tag release\" -F .github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Sign commits in CI
Problem: Our repo settings require all commits in PRs to be signed.
Solution: Sign commits created by the CI using the same key that is used
for the package and artifacts signing.
|
603,652
|
27.10.2021 19:01:17
| -10,800
|
70d91ba39039ce4ec9b3d592aa36792e6c69114d
|
[Chore] Add missing mojave bottle for 010 baker
Problem: A mojave bottle is missing for the 010 baker formula.
Solution: Add missing bottle hash.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -28,6 +28,7 @@ class TezosBaker010Ptgranad < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/\"\nsha256 cellar: :any, catalina: \"57879e69e556439e498baf2172474b04ab1963b8115508f565f2cde2596dff74\"\n+ sha256 cellar: :any, mojave: \"5c17d92a7ccd1f005c241957aa9175b7a61b96ff1e726685b04f58956580dd24\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Add missing mojave bottle for 010 baker
Problem: A mojave bottle is missing for the 010 baker formula.
Solution: Add missing bottle hash.
|
603,650
|
04.11.2021 13:31:38
| -3,600
|
9553faa8957b6996bd50319f3416c74c5a313c3a
|
[Chore] Increase rust version used
Problem: the rust version used no longer matches the recommended one.
Solution: update the rust version used.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-accuser-010-PtGRANAD.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosAccuser010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosAdminClient < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"new_path": "Formula/tezos-baker-010-PtGRANAD.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosBaker010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosClient < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosCodec < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"new_path": "Formula/tezos-endorser-010-PtGRANAD.rb",
"diff": "@@ -37,7 +37,7 @@ class TezosEndorser010Ptgranad < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosNode < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosSandbox < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -36,7 +36,7 @@ class TezosSigner < Formula\nsystem \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.44.0\", \"-y\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\nsystem \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\nsystem [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/build/build-tezos.sh",
"new_path": "docker/build/build-tezos.sh",
"diff": "@@ -14,12 +14,10 @@ cd tezos\ngit apply ../static.patch\nexport OPAMYES=\"true\"\n-# Alpine 3.12 already provides rust with required version\n-# Uncomment and adjust when another version is required by Tezos\n-# wget https://sh.rustup.rs/rustup-init.sh\n-# chmod +x rustup-init.sh\n-# ./rustup-init.sh --profile minimal --default-toolchain 1.52.1 -y\n-# source \"$HOME/.cargo/env\"\n+wget https://sh.rustup.rs/rustup-init.sh\n+chmod +x rustup-init.sh\n+./rustup-init.sh --profile minimal --default-toolchain 1.52.1 -y\n+source \"$HOME/.cargo/env\"\nopam init --bare --disable-sandboxing\nmake build-deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Increase rust version used
Problem: the rust version used no longer matches the recommended one.
Solution: update the rust version used.
|
603,658
|
04.11.2021 16:33:16
| -3,600
|
ce34565735a31cc03a8a84b4646a811fa5f8d13e
|
[Chore] Fix static_libs.patch
Problem: our static libs patch doesn't apply anymore because of some
changes to the source dune files.
Solution: fixed the patch for bin_sandbox/dune, added patches for the
new protocols.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "@@ -93,13 +93,50 @@ index c19a310a8f..6c38226293 100644\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+diff --git a/src/proto_011_PtHangz2/bin_accuser/dune b/src/proto_011_PtHangz2/bin_accuser/dune\n+index 11c77973e3..43515f16ed 100644\n+--- a/src/proto_011_PtHangz2/bin_accuser/dune\n++++ b/src/proto_011_PtHangz2/bin_accuser/dune\n+@@ -10,4 +10,6 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_011_PtHangz2_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+diff --git a/src/proto_011_PtHangz2/bin_baker/dune b/src/proto_011_PtHangz2/bin_baker/dune\n+index 0535edf13c..f0c85ad447 100644\n+--- a/src/proto_011_PtHangz2/bin_baker/dune\n++++ b/src/proto_011_PtHangz2/bin_baker/dune\n+@@ -10,4 +10,6 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_011_PtHangz2_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+diff --git a/src/proto_011_PtHangz2/bin_endorser/dune b/src/proto_011_PtHangz2/bin_endorser/dune\n+index c19a310a8f..6c38226293 100644\n+--- a/src/proto_011_PtHangz2/bin_endorser/dune\n++++ b/src/proto_011_PtHangz2/bin_endorser/dune\n+@@ -10,4 +10,6 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_011_PtHangz2_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\ndiff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\nindex 6289c6d124..aa2eb20a29 100644\n--- a/src/bin_sandbox/dune\n+++ b/src/bin_sandbox/dune\n-@@ -3,4 +3,4 @@\n+@@ -2,4 +2,5 @@\n+ (names main)\n(libraries tezos-base\ntezos-base.unix\n- flextesa)\n-- (flags :standard))\n+- flextesa))\n++ flextesa)\n+ (flags :standard -ccopt -static))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix static_libs.patch
Problem: our static libs patch doesn't apply anymore because of some
changes to the source dune files.
Solution: fixed the patch for bin_sandbox/dune, added patches for the
new protocols.
|
603,658
|
04.11.2021 19:22:08
| -3,600
|
a323b0295fe6720dabe4dd9f865123f3bdf62e12
|
[Chore] Fix tag parsing in docker source builds
Problem: the opam repository tag formatting was changed in the version.sh
script upstream to use 'export'. Consequently, our parser that relies on
the line starting with the tag variable now fails to parse it.
Solution: added 'export' to the beginning of our regular expression.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -227,7 +227,7 @@ class TezosBinaryPackage(AbstractPackage):\nsubprocess.run([\"git\", \"clone\", \"https://gitlab.com/tezos/opam-repository.git\"])\nwith open(\"tezos/scripts/version.sh\", \"r\") as f:\nopam_repository_tag = re.search(\n- \"^opam_repository_tag=([0-9a-z]*)\", f.read(), flags=re.MULTILINE\n+ \"^export opam_repository_tag=([0-9a-z]*)\", f.read(), flags=re.MULTILINE\n).group(1)\nos.chdir(\"opam-repository\")\nsubprocess.run([\"git\", \"checkout\", opam_repository_tag])\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix tag parsing in docker source builds
Problem: the opam repository tag formatting was changed in the version.sh
script upstream to use 'export'. Consequently, our parser that relies on
the line starting with the tag variable now fails to parse it.
Solution: added 'export' to the beginning of our regular expression.
|
603,658
|
04.11.2021 21:05:36
| -3,600
|
55953809c0eaab7f8ef9a4faa472505db3147035
|
[Chore] Fix docker tests
Problem: to allow for lower version releases, we have changed the docker
static build script to use 'make' instead of 'make build'. This now leads
to the static profile being overridden and docker tests failing.
Solution: change it back.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/build-tezos.sh",
"new_path": "docker/build/build-tezos.sh",
"diff": "@@ -21,5 +21,5 @@ source \"$HOME/.cargo/env\"\nopam init --bare --disable-sandboxing\nmake build-deps\n-eval \"$(opam env)\" && PROFILE=\"static\" make && make build-sandbox\n+eval \"$(opam env)\" && PROFILE=\"static\" make build && make build-sandbox\nchmod +w tezos-*\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix docker tests
Problem: to allow for lower version releases, we have changed the docker
static build script to use 'make' instead of 'make build'. This now leads
to the static profile being overridden and docker tests failing.
Solution: change it back.
|
603,650
|
05.11.2021 14:09:14
| -3,600
|
924501fb45aac3365454095f325e085cc360f95c
|
[Chore] fix hangzhou-specific class names in brew formulae
Problem: class names in brew formulae for hangzhou don't match
their respective filenames.
Solution: fix up the class names.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"new_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"diff": "#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-class TezosAccuser011Pthangzh < Formula\n+class TezosAccuser011Pthangz2 < Formula\n@all_bins = []\nclass << self\n@@ -26,7 +26,7 @@ class TezosAccuser011Pthangzh < Formula\ndesc \"Daemon for accusing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser011Pthangzh.version}/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser011Pthangz2.version}/\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-011-PtHangz2.rb",
"new_path": "Formula/tezos-baker-011-PtHangz2.rb",
"diff": "#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-class TezosBaker011Pthangzh < Formula\n+class TezosBaker011Pthangz2 < Formula\n@all_bins = []\nclass << self\n@@ -26,7 +26,7 @@ class TezosBaker011Pthangzh < Formula\ndesc \"Daemon for baking\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker011Pthangzh.version}/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker011Pthangz2.version}/\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"new_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"diff": "#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-class TezosEndorser011Pthangzh < Formula\n+class TezosEndorser011Pthangz2 < Formula\n@all_bins = []\nclass << self\n@@ -27,7 +27,7 @@ class TezosEndorser011Pthangzh < Formula\ndesc \"Daemon for endorsing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser011Pthangzh.version}/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser011Pthangz2.version}/\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] fix hangzhou-specific class names in brew formulae
Problem: class names in brew formulae for hangzhou don't match
their respective filenames.
Solution: fix up the class names.
|
603,652
|
08.11.2021 10:41:39
| -10,800
|
be9862a07def79cde5396ff8d72c0dcee5079c06
|
Update release PR template
Problem: Many parts of the releasing process were automated and now PR
template that is used for new releases is outdated.
Solution: Remove all steps of the releasing process that are now
performed automatically by the CI. Add step that mentions merging
PR with hashes update.
|
[
{
"change_type": "MODIFY",
"old_path": ".github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md",
"new_path": ".github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md",
"diff": "@@ -19,11 +19,6 @@ Follows #\n### Changes related to the creation of a release (conditional)\n-- [ ] I updated Tezos sources and opam-repository (if needed) revisions in [sources.json](/serokell/tezos-packaging/tree/master/nix/nix/sources.json).\n- The opam-repository revision should be the same as the one defined in\n- [`tezos/tezos`](https://gitlab.com/tezos/tezos/-/blob/master/scripts/version.sh) for the relevant tag.\n-- [ ] I removed old bottles hashes from the brew formulas in [Formula directory](/serokell/tezos-packaging/tree/master/Formula).\n-- [ ] I updated `url :tag` and `version`s in brew formulas.\n- [ ] I updated release number in [meta.json](/serokell/tezos-packaging/tree/master/meta.json).\n- [ ] If the native release version was updated, I reset the `letter_version` in [model.py](/serokell/tezos-packaging/tree/master/docker/package/model.py).\n@@ -46,19 +41,11 @@ and checking unfinished points in the merged release PR using this template.\n- [ ] I created a new release that is based on the latest autorelease created by the CI.\n#### Update brew bottles and repository mirrors\n-\n-- [ ] I compiled brew bottles for all required macOS versions using [`build-bottles.sh`](/serokell/tezos-packaging/tree/scripts/build-bottles.sh)\n- script and uploaded them to the created release.\n- Note that for this you'll need a macOS machine running each required version.\n-- [ ] I added new bottles sha256 hashes to the brew formulas.\n+- [ ] I merged PR that updates bottles hashes (this PR is supposed to be created by the CI).\n+<!--TODO: remove once https://github.com/serokell/tezos-packaging/issues/314 is resolved -->\n- [ ] I pushed changes to either [tezos-packaging-rc](https://github.com/serokell/tezos-packaging-rc) or\n[tezos-packaging-stable](https://github.com/serokell/tezos-packaging-stable) mirror repositories.\n-#### Publish new native packages\n-\n-- [ ] I published new Ubuntu packages, see [these instructions](/serokell/tezos-packaging/tree/master/docker#source-packages-and-publishing-them-on-launchpad-ppa).\n-- [ ] I published new Fedora packages, see [these instructions](/serokell/tezos-packaging/tree/master/docker#srcrpm-packages).\n-\n#### Update documentation\n- [ ] I updated [README.md](/serokell/tezos-packaging/tree/master/README.md).\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#328] Update release PR template
Problem: Many parts of the releasing process were automated and now PR
template that is used for new releases is outdated.
Solution: Remove all steps of the releasing process that are now
performed automatically by the CI. Add step that mentions merging
PR with hashes update.
|
603,652
|
08.11.2021 10:49:59
| -10,800
|
742372f0386395e70b5d1b574f694e65de810925
|
Keep single PR template
Problem: Users now don't need to have access to the release PR template
since it's supposed to be used only by the CI.
Solution: Keep only one default PR template.
|
[
{
"change_type": "RENAME",
"old_path": ".github/PULL_REQUEST_TEMPLATE/pull_request_template.md",
"new_path": ".github/pull_request_template.md",
"diff": "@@ -22,7 +22,7 @@ Resolves #\n#### Related changes (conditional)\n-- [ ] I checked whether I should update the [README](../../tree/master/README.md)\n+- [ ] I checked whether I should update the [README](/serokell/tezos-packaging/tree/master/README.md)\n- [ ] I checked whether native packaging works, i.e. native binary packages\ncan be successfully built.\n"
},
{
"change_type": "RENAME",
"old_path": ".github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md",
"new_path": ".github/release_pull_request_template.md",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "scripts/update-tezos.sh",
"new_path": "scripts/update-tezos.sh",
"diff": "@@ -46,7 +46,7 @@ if [[ \"$latest_upstream_tag\" != \"$our_tezos_tag\" ]]; then\ngit commit -a -m \"[Chore] Update brew formulae for $latest_upstream_tag\" --gpg-sign=\"tezos-packaging@serokell.io\"\ngit push --set-upstream origin \"$branch_name\"\n- gh pr create -B master -t \"[Chore] $latest_upstream_tag release\" -F .github/PULL_REQUEST_TEMPLATE/release_pull_request_template.md\n+ gh pr create -B master -t \"[Chore] $latest_upstream_tag release\" -F .github/release_pull_request_template.md\nfi\nelse\necho \"Our version is the same as the latest tag in the upstream repository\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#328] Keep single PR template
Problem: Users now don't need to have access to the release PR template
since it's supposed to be used only by the CI.
Solution: Keep only one default PR template.
|
603,652
|
11.11.2021 12:36:19
| -10,800
|
d5dbe575f9404eef11b5dd386d0e772c79aef801
|
Handle non-dict steps in pipeline filtering
Problem: Currently filter-pipeline.py will fail in case a pipeline
configuration has non-dict steps, e.g. 'wait'.
Solution: Ignore non-dict steps in pipeline-filtering and don't skip
them in the resulting pipeline.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/filter-pipeline.py",
"new_path": ".buildkite/filter-pipeline.py",
"diff": "@@ -120,9 +120,10 @@ visited = set()\nvisited_rev = set()\nsteps = pipeline[\"steps\"]\n-key_to_label = build_key_to_label(steps)\n-depends_on_dict, depends_on_dict_rev = build_tree(steps, key_to_label)\n-for step in steps:\n+dict_steps = list(filter(lambda x: isinstance(x, dict), steps))\n+key_to_label = build_key_to_label(dict_steps)\n+depends_on_dict, depends_on_dict_rev = build_tree(dict_steps, key_to_label)\n+for step in dict_steps:\nif check_step(step, splitted_diff):\nlabel = step[\"label\"]\ndfs(label, depends_on_dict, visited)\n@@ -131,7 +132,7 @@ for step in steps:\nfor name in visited:\ndfs(name, depends_on_dict_rev, visited_rev)\n-for step in steps:\n+for step in dict_steps:\nlabel = step[\"label\"]\nif (label not in visited) and (label not in visited_rev):\nstep[\"skip\"] = \"skipped due to lack of changes\"\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/buildkite/golden/pipeline-A.yml",
"new_path": "tests/buildkite/golden/pipeline-A.yml",
"diff": "@@ -30,6 +30,7 @@ steps:\n- E\nkey: H\nlabel: H\n+- wait\n- depends_on:\n- A\nkey: X\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/buildkite/golden/pipeline-C.yml",
"new_path": "tests/buildkite/golden/pipeline-C.yml",
"diff": "@@ -31,6 +31,7 @@ steps:\n- E\nkey: H\nlabel: H\n+- wait\n- depends_on:\n- A\nkey: X\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/buildkite/golden/pipeline-G.yml",
"new_path": "tests/buildkite/golden/pipeline-G.yml",
"diff": "@@ -32,6 +32,7 @@ steps:\nkey: H\nlabel: H\nskip: skipped due to lack of changes\n+- wait\n- depends_on:\n- A\nkey: X\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/buildkite/golden/pipeline-X.yml",
"new_path": "tests/buildkite/golden/pipeline-X.yml",
"diff": "@@ -37,6 +37,7 @@ steps:\nkey: H\nlabel: H\nskip: skipped due to lack of changes\n+- wait\n- depends_on:\n- A\nkey: X\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/buildkite/pipeline-raw.yml",
"new_path": "tests/buildkite/pipeline-raw.yml",
"diff": "@@ -50,6 +50,7 @@ steps:\n- E\nonly_changes:\n- H\n+ - wait\n- label: X\nkey: X\ndepends_on:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#332] Handle non-dict steps in pipeline filtering
Problem: Currently filter-pipeline.py will fail in case a pipeline
configuration has non-dict steps, e.g. 'wait'.
Solution: Ignore non-dict steps in pipeline-filtering and don't skip
them in the resulting pipeline.
|
603,652
|
08.11.2021 10:20:32
| -10,800
|
754c7134d69a3b941644081c1d85dc2538a33176
|
[Chore] Don't sign commits in bottles sync script
Problem: Public github actions runners don't have access to our signing
key and thus it's impossible to sign commits in it.
Solution: Don't sign commits in this script, signing will be performed
separately.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/sync-bottle-hashes.sh",
"new_path": "scripts/sync-bottle-hashes.sh",
"diff": "-#! /usr/bin/env nix-shell\n-#! nix-shell shell.nix -i bash\n+#! /usr/bin/env bash\n# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n@@ -32,7 +31,7 @@ while : ; do\ngit fetch --all\ngit reset --hard origin/\"$branch_name\"\n./scripts/bottle-hashes.sh .\n- git commit -a -m \"[Chore] Add $1 hashes to brew formulae\" --gpg-sign=\"tezos-packaging@serokell.io\"\n+ git commit -a -m \"[Chore] Add $1 hashes to brew formulae\"\n! git push || break\ndone\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Don't sign commits in bottles sync script
Problem: Public github actions runners don't have access to our signing
key and thus it's impossible to sign commits in it.
Solution: Don't sign commits in this script, signing will be performed
separately.
|
603,658
|
11.11.2021 16:00:54
| -3,600
|
955c55ffbb6520081ae25463d47c8be72f6281f2
|
Update release PR template
Problem: we used to have to push to mirror repositories manually, but
now it's automated as well. The step is still in the PR template, however.
Solution: remove this step from the template.
|
[
{
"change_type": "MODIFY",
"old_path": ".github/release_pull_request_template.md",
"new_path": ".github/release_pull_request_template.md",
"diff": "@@ -42,9 +42,6 @@ and checking unfinished points in the merged release PR using this template.\n#### Update brew bottles and repository mirrors\n- [ ] I merged PR that updates bottles hashes (this PR is supposed to be created by the CI).\n-<!--TODO: remove once https://github.com/serokell/tezos-packaging/issues/314 is resolved -->\n-- [ ] I pushed changes to either [tezos-packaging-rc](https://github.com/serokell/tezos-packaging-rc) or\n- [tezos-packaging-stable](https://github.com/serokell/tezos-packaging-stable) mirror repositories.\n#### Update documentation\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#328] Update release PR template
Problem: we used to have to push to mirror repositories manually, but
now it's automated as well. The step is still in the PR template, however.
Solution: remove this step from the template.
|
603,658
|
15.11.2021 15:27:13
| -3,600
|
150a47be9db00b615acbc1f9e5a87b60bba68305
|
Update release PR template
Problem: we used to have to publish releases manually, but now it's
automated as well. The step is still in the PR template, however.
Solution: remove this step from the template.
|
[
{
"change_type": "MODIFY",
"old_path": ".github/release_pull_request_template.md",
"new_path": ".github/release_pull_request_template.md",
"diff": "@@ -36,10 +36,6 @@ Some of the changes are done after the new release is created, consider followin\nand checking unfinished points in the merged release PR using this template.\n-->\n-#### Create a new release in this repository\n-\n-- [ ] I created a new release that is based on the latest autorelease created by the CI.\n-\n#### Update brew bottles and repository mirrors\n- [ ] I merged PR that updates bottles hashes (this PR is supposed to be created by the CI).\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#328] Update release PR template
Problem: we used to have to publish releases manually, but now it's
automated as well. The step is still in the PR template, however.
Solution: remove this step from the template.
|
603,658
|
15.11.2021 16:08:24
| -3,600
|
4f25979025dae7a2ecdfbde0c4eccd5e94f8bd9d
|
Fix 'not on branch' error on updating mirrors
Problem: in a CI run after merging a release PR, updating the relevant
mirror repo fails because we don't use the proper '--mirror' option.
Solution: added the flag to the commands.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-raw.yml",
"new_path": ".buildkite/pipeline-raw.yml",
"diff": "@@ -170,14 +170,14 @@ steps:\nbuild.branch == \"master\" &&\n( build.message =~ /^Merge pull request .* from serokell\\/auto\\/v[0-9]+\\.[0-9]+-release/ ||\nbuild.message =~ /^Merge pull request .* from serokell\\/auto\\/update-brew-formulae-v[.0-9]+-[0-9]+/ )\n- command: git push git@github.com:serokell/tezos-packaging-stable.git\n+ command: git push --mirror git@github.com:serokell/tezos-packaging-stable.git\n- label: update RC mirror repository\nif: |\nbuild.branch == \"master\" &&\n(build.message =~ /^Merge pull request .* from serokell\\/auto\\/v[0-9]+\\.[0-9]+-rc.*-release/ ||\nbuild.message =~ /^Merge pull request .* from serokell\\/auto\\/update-brew-formulae-v[.0-9]+-rc.*/)\n- command: git push git@github.com:serokell/tezos-packaging-rc.git\n+ command: git push --mirror git@github.com:serokell/tezos-packaging-rc.git\n# To avoid race-conditions for the gpg key between jobs which sometimes leads to a weird errors\n- wait\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#314] Fix 'not on branch' error on updating mirrors
Problem: in a CI run after merging a release PR, updating the relevant
mirror repo fails because we don't use the proper '--mirror' option.
Solution: added the flag to the commands.
|
603,652
|
16.11.2021 13:52:51
| -10,800
|
52b7bf5f59df5b37f25db501aa2c02906c4e3294
|
[Chore] Fix bottles' hashes PR header
Problem: It has outdated <unsigned> suffix that it a leftover from one
of the !327 versions.
Solution: Remove this suffix from the PR header.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/sync-bottle-hashes.sh",
"new_path": "scripts/sync-bottle-hashes.sh",
"diff": "@@ -45,6 +45,6 @@ set +e\n# We create the PR with the first push, when the other pipeline hasn't finished yet.\n# That's why we 'set +e': one of the two times the command will fail.\n-gh pr create -B master -t \"[Chore] Add bottle hashes for $1 <unsigned>\" -b \"$pr_body\"\n+gh pr create -B master -t \"[Chore] Add bottle hashes for $1\" -b \"$pr_body\"\nexit 0\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix bottles' hashes PR header
Problem: It has outdated <unsigned> suffix that it a leftover from one
of the !327 versions.
Solution: Remove this suffix from the PR header.
|
603,652
|
16.11.2021 17:32:23
| -10,800
|
55427fff3f2f2a020e87eacad4550c840946c8db
|
[Chore] Sign commits in the first pipeline step
Problem: When we sign commits we have to run the CI on the same changes
twice since the signing doesn't actually affect changes in commits.
Solution: Exit pipeline in case commits were successfully signed in
order to avoid redundant CI run.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-raw.yml",
"new_path": ".buildkite/pipeline-raw.yml",
"diff": "@@ -6,6 +6,15 @@ env:\nSET_VERSION: \"export TEZOS_VERSION=\\\"$(cat nix/nix/sources.json | jq -r '.tezos.ref' | cut -d'/' -f3)\\\"\"\nsteps:\n+ # We need to sign commits that update brew formulae separately\n+ - label: Sign formulae update commits\n+ if: build.branch =~ /^auto\\/update-brew-formulae-.*/\n+ commands:\n+ - nix-shell ./scripts/shell.nix\n+ --run './scripts/sign-commits.sh'\n+ # To avoid race-conditions for the gpg key between jobs which sometimes leads to weird errors\n+ - wait\n+\n- label: reuse lint\ncommand: nix run -f . pkgs.reuse -c reuse lint\n- label: check trailing whitespace\n@@ -183,12 +192,3 @@ steps:\ndepends_on:\n- \"auto-release\"\ncommand: git push --mirror git@github.com:serokell/tezos-packaging-rc.git\n-\n- # To avoid race-conditions for the gpg key between jobs which sometimes leads to a weird errors\n- - wait\n- # We need to sign commits that update brew formulae separately\n- - label: Sign formulae update commits\n- if: build.branch =~ /^auto\\/update-brew-formulae-.*/\n- commands:\n- - nix-shell ./scripts/shell.nix\n- --run './scripts/sign-commits.sh'\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/sign-commits.sh",
"new_path": "scripts/sign-commits.sh",
"diff": "@@ -34,3 +34,7 @@ while : ; do\nexit 0\nfi\ndone\n+\n+# Branch is updated when commits are successfully signed so we exit with non-zero exit code to stop the pipeline in order\n+# to avoid running steps on the outdated branch revision\n+exit 1\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Sign commits in the first pipeline step
Problem: When we sign commits we have to run the CI on the same changes
twice since the signing doesn't actually affect changes in commits.
Solution: Exit pipeline in case commits were successfully signed in
order to avoid redundant CI run.
|
603,652
|
25.11.2021 13:13:54
| -10,800
|
2a91399e1bf1eedb016ff0d5d278ca4bdd5ddec2
|
[Chore] Adjust hacks.nix
Problem: opam-nix didn't manage to handle weird format of
patched bls12-381-unix opam file:(
Solution: Adjust hacks.nix and define sources and patch explicitely.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -86,7 +86,7 @@ rec {\nbuildInputs = o.buildInputs ++ [ alcotest ocp-indent ];\n});\n- bls12-381 = osuper.bls12-381.versions.\"1.0.1\".overrideAttrs (o:\n+ bls12-381 = osuper.bls12-381.versions.\"1.0.1+no_adx\".overrideAttrs (o:\nrec {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\nbuildPhase = ''\n@@ -96,6 +96,18 @@ rec {\nbls12-381-unix = osuper.bls12-381-unix.overrideAttrs (o:\nrec {\n+ version = \"1.0.1+no_adx\";\n+ src = self.fetchurl {\n+ url =\n+ \"https://gitlab.com/dannywillems/ocaml-bls12-381/-/archive/1.0.1/ocaml-bls12-381-1.0.1.tar.bz2\";\n+ sha256 = \"sha256-9/LcoZBLsaZb53xZa0SMEhcJX0jHj+5QU4wnE4mFV0E=\";\n+ };\n+ patches = [\n+ (self.fetchurl {\n+ url = \"https://gitlab.com/tezos/opam-repository/-/raw/efc37824b5abfccbf7deeb5d8eebd190348f5a4b/packages/bls12-381-unix/bls12-381-unix.1.0.1+no_adx/files/force-no-adx.diff\";\n+ sha256 = \"sha256-nL+w+fmoMskVj52Dm9+Z3pVRWFn6Eq1xkwg1iey578k=\";\n+ })\n+ ];\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\n});\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Adjust hacks.nix
Problem: opam-nix didn't manage to handle weird format of
patched bls12-381-unix opam file:(
Solution: Adjust hacks.nix and define sources and patch explicitely.
|
603,652
|
25.11.2021 13:49:51
| -10,800
|
124c8e7ccb80dd6f00208d7844b1523973d73d06
|
[Chore] Add workaround for Ubuntu package version
Problem: Debian build utils don't like '_' symbol in version.
Solution: Replace it with '-' where necessary.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/ubuntu.py",
"new_path": "docker/package/ubuntu.py",
"diff": "@@ -18,10 +18,12 @@ def build_ubuntu_package(\n):\n# ubuntu prohibits uppercase in packages names\npkg_name = pkg.name.lower()\n- dir = f\"{pkg_name}-{pkg.meta.version}\"\n+ old_version = pkg.meta.version\n+ # debian build utils don't like '_' symbol in version\n+ fixed_version = pkg.meta.version.replace(\"_\", \"-\")\n+ dir = f\"{pkg_name}-{fixed_version}\"\ncwd = os.path.dirname(__file__)\ndate = subprocess.check_output([\"date\", \"-R\"]).decode().strip()\n-\nif source_archive_path is None:\npkg.fetch_sources(dir)\npkg.gen_makefile(f\"{dir}/Makefile\")\n@@ -29,6 +31,7 @@ def build_ubuntu_package(\nelse:\nshutil.copy(f\"{cwd}/../{source_archive_path}\", f\"{dir}.tar.gz\")\nsubprocess.run([\"tar\", \"-xzf\", f\"{dir}.tar.gz\"], check=True)\n+ pkg.meta.version = fixed_version\nfor ubuntu_version in ubuntu_versions:\nos.chdir(dir)\nsubprocess.run([\"rm\", \"-r\", \"debian\"])\n@@ -77,7 +80,10 @@ def build_ubuntu_package(\npkg.gen_postinst(\"debian/postinst\")\npkg.gen_postrm(\"debian/postrm\")\npkg.gen_control_file(build_deps, ubuntu_version, \"debian/control\")\n+ # License is downloaded from the tezos repo, thus version should be without workarounds\n+ pkg.meta.version = old_version\npkg.gen_license(\"debian/copyright\")\n+ pkg.meta.version = fixed_version\nsubprocess.run(\n\"rm debian/*.ex debian/*.EX debian/README*\", shell=True, check=True\n)\n@@ -87,5 +93,6 @@ def build_ubuntu_package(\ncheck=True,\n)\nos.chdir(\"..\")\n+ pkg.meta.version = old_version\nsubprocess.run(f\"rm -rf {dir}\", shell=True, check=True)\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Add workaround for Ubuntu package version
Problem: Debian build utils don't like '_' symbol in version.
Solution: Replace it with '-' where necessary.
|
603,652
|
25.11.2021 15:16:38
| -10,800
|
00e15b0d51636e90d0046b752902bdfba40fdb0a
|
[Chore] Enable hangzhou in mainnet baking service
Problem: Hangzhou protocol is going to be activated soon, we should
enable daemons for new protocol before it gets activated, so that users
will have smooth transition.
Solution: Enable new protocol in mainnet baking service.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -15,7 +15,7 @@ from .systemd import Service, ServiceFile, SystemdUnit, Unit, Install\nnetworks = [\"mainnet\", \"granadanet\", \"hangzhounet\"]\nnetworks_protos = {\n- \"mainnet\": [\"010-PtGRANAD\"],\n+ \"mainnet\": [\"010-PtGRANAD\", \"011-PtHangz2\"],\n\"granadanet\": [\"010-PtGRANAD\"],\n\"hangzhounet\": [\"011-PtHangz2\"],\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Enable hangzhou in mainnet baking service
Problem: Hangzhou protocol is going to be activated soon, we should
enable daemons for new protocol before it gets activated, so that users
will have smooth transition.
Solution: Enable new protocol in mainnet baking service.
|
603,652
|
09.12.2021 17:52:37
| -10,800
|
b8ace159a3a2d32e4dbed92a3d2fdcfda8d5449d
|
[Chore] Bump tezos-baking letter version
Problem: We're going to release update for tezos-baking that will remove
granada daemons from mainnet baking service.
Solution: Bump tezos-baking letter version in order to be able to
release update.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -473,7 +473,7 @@ class TezosBakingServicesPackage(AbstractPackage):\n# native releases, so we append an extra letter to the version of\n# the package.\n# This should be reset to \"\" whenever the native version is bumped.\n- letter_version = \"\"\n+ letter_version = \"a\"\ndef __init__(\nself,\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Bump tezos-baking letter version
Problem: We're going to release update for tezos-baking that will remove
granada daemons from mainnet baking service.
Solution: Bump tezos-baking letter version in order to be able to
release update.
|
603,652
|
17.12.2021 15:11:36
| -10,800
|
f90d936e8d2c1565daefb943305c356213689c59
|
Dynamically determine architecture for opam
Problem: Currently formulae download opam x86_64 binary from the
GitHub release, which causes a build failure on machines with M1 CPU.
Solution: Determine CPU architecture in runtime and download appropriate
opam binary.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"new_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"diff": "@@ -35,7 +35,8 @@ class TezosAccuser011Pthangz2 < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -35,7 +35,8 @@ class TezosAdminClient < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-011-PtHangz2.rb",
"new_path": "Formula/tezos-baker-011-PtHangz2.rb",
"diff": "@@ -35,7 +35,8 @@ class TezosBaker011Pthangz2 < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosClient < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -35,7 +35,8 @@ class TezosClient < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -35,7 +35,8 @@ class TezosCodec < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"new_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"diff": "@@ -36,7 +36,8 @@ class TezosEndorser011Pthangz2 < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -35,7 +35,8 @@ class TezosNode < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -34,7 +34,8 @@ class TezosSandbox < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -35,7 +35,8 @@ class TezosSigner < Formula\nENV.deparallelize\nENV[\"CARGO_HOME\"]=\"./.cargo\"\n# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- system \"curl\", \"-L\", \"https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos\", \"--create-dirs\", \"-o\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\nsystem \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\nENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\nsystem \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#205] Dynamically determine architecture for opam
Problem: Currently formulae download opam x86_64 binary from the
GitHub release, which causes a build failure on machines with M1 CPU.
Solution: Determine CPU architecture in runtime and download appropriate
opam binary.
|
603,652
|
17.12.2021 15:15:09
| -10,800
|
c468a5a2dca7dfa125fe448e4025a31ce84632bf
|
Bump formulae version and release number
Problem: We want to release new versions of brew formulae that work on
M1.
Solution: Bump version in formulae and bump release number in meta.json.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"new_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosAccuser011Pthangz2 < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosAccuser011Pthangz2 < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser011Pthangz2.version}/\"\n- sha256 cellar: :any, catalina: \"85131133994b5e081e1d798bbdc19bea15be1d31244425356bf6a380647947b5\"\n- sha256 cellar: :any, mojave: \"34122f13a471f526c8fd080852d408ea2f283ed74739cfa05c1d235bcb0b1f0f\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosAdminClient < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n- sha256 cellar: :any, catalina: \"e52d8309f4949de2ac58dfab3b55bac0affa07454cf925201052c04cf49e8f74\"\n- sha256 cellar: :any, mojave: \"3ad9ce649528ed84775acdf3a6dad5cc15e0b2f56d0791d116678a37b5118011\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-011-PtHangz2.rb",
"new_path": "Formula/tezos-baker-011-PtHangz2.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosBaker011Pthangz2 < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosBaker011Pthangz2 < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker011Pthangz2.version}/\"\n- sha256 cellar: :any, catalina: \"1e4b26e392d46d8d98fbc8f4eb33839f4e0533a4618192c1d3fa5e4934ce3f58\"\n- sha256 cellar: :any, mojave: \"ea09f0531dbcfa0741b2475fd529c083878c7e5de8a4383f9535fa0f6698581e\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,8 +27,6 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n- sha256 cellar: :any, catalina: \"78f048172a602f00cc863fdd7e92f51ac838f197962f49ea29bcde8c4ca0cb70\"\n- sha256 cellar: :any, mojave: \"2ded50c5b7d488d26acb98e02ece948ed1cdba3f1181fbb9613ea74d1c79b6b8\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosCodec < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n- sha256 cellar: :any, catalina: \"f5806d598791141eb6e84f97291fc662660444c670f5b195a7870831360ccab7\"\n- sha256 cellar: :any, mojave: \"b896b3ae6492b632cabf757e08e53934cdebbbae58139ef0272aad8313308d6b\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"new_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosEndorser011Pthangz2 < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -28,8 +28,6 @@ class TezosEndorser011Pthangz2 < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser011Pthangz2.version}/\"\n- sha256 cellar: :any, catalina: \"08e27735c7b211d01c6d2811d5277f27632d6266ce37f25e4ed8eed195f2c96f\"\n- sha256 cellar: :any, mojave: \"775f3c3681ce511effd62146208bb4458f2f2454e9ceb21efb9a4afaad41eb65\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-hangzhounet.rb",
"new_path": "Formula/tezos-node-hangzhounet.rb",
"diff": "class TezosNodeHangzhounet < Formula\nurl \"file:///dev/null\"\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "class TezosNodeMainnet < Formula\nurl \"file:///dev/null\"\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbottle :unneeded\ndepends_on \"tezos-node\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosNode < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n- sha256 cellar: :any, catalina: \"758915ccf47f0393042c2663f170a400597a424bdf00e687613260922724d50b\"\n- sha256 cellar: :any, mojave: \"f483696e497991b16a9bc34b417c4b613efeb003dd0753a68ed9c6aa455e1694\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosSandbox < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,7 +27,6 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n- sha256 cellar: :any, catalina: \"fa023385d72c253f5d7cb42376b10416f1cef463d47afbf651138d3bb264709e\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "class TezosSignerHttp < Formula\nurl \"file:///dev/null\"\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "class TezosSignerHttps < Formula\nurl \"file:///dev/null\"\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "class TezosSignerTcp < Formula\nurl \"file:///dev/null\"\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "class TezosSignerUnix < Formula\nurl \"file:///dev/null\"\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbottle :unneeded\ndepends_on \"tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -12,7 +12,7 @@ class TezosSigner < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.0+no_adx\", :shallow => false\n- version \"v11.0+no_adx-1\"\n+ version \"v11.0+no_adx-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\nbuild_dependencies.each do |dependency|\n@@ -27,8 +27,6 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n- sha256 cellar: :any, catalina: \"3759467a866693df55f9b8d056f9d20b919ec1db15ca5501e81963eaf42f0ff1\"\n- sha256 cellar: :any, mojave: \"a116fe6a65c0798746b3599be921f16bdf045902cbac1fbe2a0de7ec30beb8c0\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "meta.json",
"new_path": "meta.json",
"diff": "{\n- \"release\": \"1\",\n+ \"release\": \"2\",\n\"maintainer\": \"Serokell <hi@serokell.io>\"\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#205] Bump formulae version and release number
Problem: We want to release new versions of brew formulae that work on
M1.
Solution: Bump version in formulae and bump release number in meta.json.
|
603,652
|
17.12.2021 16:46:59
| -10,800
|
6eb1423c602f6f7d836bfe32e4e972c1936c36b6
|
Mention macOS version in bottles update
Problem: 'sync-bottles-hashes.sh' script requires macOS version as an
argument, but it isn't used anywhere in the script.
Solution: Mention used macOS version in the commit header.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/sync-bottle-hashes.sh",
"new_path": "scripts/sync-bottle-hashes.sh",
"diff": "@@ -31,7 +31,7 @@ while : ; do\ngit fetch --all\ngit reset --hard origin/\"$branch_name\"\n./scripts/bottle-hashes.sh .\n- git commit -a -m \"[Chore] Add $1 hashes to brew formulae\"\n+ git commit -a -m \"[Chore] Add $1 hashes to brew formulae for $2\"\n! git push || break\ndone\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#353] Mention macOS version in bottles update
Problem: 'sync-bottles-hashes.sh' script requires macOS version as an
argument, but it isn't used anywhere in the script.
Solution: Mention used macOS version in the commit header.
|
603,652
|
17.12.2021 18:05:03
| -10,800
|
85c6f99531513ef64e615d9cc09ee0b127132950
|
[Chore] Add Big Sur tezos-sappling-params bottle
Problem: tezos-sapling-params formula is used as a dependency for the
rest of the formulae with Octez binaries. However, we don't have Big Sur
bottle for it.
Solution: Since this formula isn't updated automatically, provide bottle
hash manually.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sapling-params.rb",
"new_path": "Formula/tezos-sapling-params.rb",
"diff": "@@ -15,6 +15,7 @@ class TezosSaplingParams < Formula\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSaplingParams.version}/\"\nsha256 cellar: :any, mojave: \"4e89932b0626cffe80214ba45342280c340b34c58ebbf7c3e0185a6d4662732d\"\nsha256 cellar: :any, catalina: \"5f7a5687d67051eafcfb7cb5ac542143a325a135403daeca6595602bfd400441\"\n+ sha256 cellar: :any, big_sur: \"c910acffd3369bf5c4e0cff112efe6d56035394639b9571d845ad5ecb4dbd01f\"\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Add Big Sur tezos-sappling-params bottle
Problem: tezos-sapling-params formula is used as a dependency for the
rest of the formulae with Octez binaries. However, we don't have Big Sur
bottle for it.
Solution: Since this formula isn't updated automatically, provide bottle
hash manually.
|
603,652
|
17.12.2021 18:42:26
| -10,800
|
e4760f42f4bb633bea5f35c25ba0b828d1f99f79
|
[Chore] Drop Mojave support
Problem: Mojave macOS version support has ended there is no sense in
supporting it in our formulae anymore.
Solution: Don't build, upload and provide hashes for Mojave bottles.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline-for-tags.yml",
"new_path": ".buildkite/pipeline-for-tags.yml",
"diff": "# SPDX-License-Identifier: LicenseRef-MIT-TQ\nsteps:\n- - label: Build bottles\n- key: build-bottles\n- agents:\n- queue: \"x86_64-darwin\"\n- if: build.tag =~ /^v.*/\n- commands:\n- - ./scripts/build-bottles.sh\n- artifact_paths:\n- - '*.bottle.*'\n-\n- label: Build source packages\nkey: build-source-packages\nif: build.tag =~ /^v.*-1/\n@@ -34,24 +24,6 @@ steps:\n- buildkite-agent artifact download \"out/*\" . --step build-source-packages\n- ./scripts/publish-native-packages.sh out\n- - label: Add Mojave bottle hashes to formulae\n- depends_on:\n- - \"build-bottles\"\n- if: build.tag =~ /^v.*/\n- commands:\n- - buildkite-agent artifact download --step build-bottles \"*\" .\n- - nix-shell ./scripts/shell.nix\n- --run './scripts/sync-bottle-hashes.sh \"$BUILDKITE_TAG\" \"Mojave\"'\n-\n- - label: Attach bottles to the release\n- depends_on:\n- - \"build-bottles\"\n- if: build.tag =~ /^v.*/\n- commands:\n- - buildkite-agent artifact download --step build-bottles \"*\" .\n- - nix-shell ./scripts/shell.nix\n- --run 'gh release upload \"$BUILDKITE_TAG\" *.bottle.*'\n-\n- label: Check for new Tezos release\nif: build.source == \"schedule\" && build.branch == \"master\"\ncommands:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Drop Mojave support
Problem: Mojave macOS version support has ended there is no sense in
supporting it in our formulae anymore.
Solution: Don't build, upload and provide hashes for Mojave bottles.
|
603,652
|
20.12.2021 14:00:42
| -10,800
|
64f924460247c84bea7d0a7390ede110236692a5
|
[Chore] Add arm64 Big Sur tezos-sapling-params bottle
Problem: tezos-sapling-params formula is used as a dependency for the
rest of the formulae with Octez binaries. However, we don't have arm64
Big Sur bottle for it.
Solution: Since this formula isn't updated automatically, provide
the corresponding bottle hash manually.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sapling-params.rb",
"new_path": "Formula/tezos-sapling-params.rb",
"diff": "@@ -16,6 +16,7 @@ class TezosSaplingParams < Formula\nsha256 cellar: :any, mojave: \"4e89932b0626cffe80214ba45342280c340b34c58ebbf7c3e0185a6d4662732d\"\nsha256 cellar: :any, catalina: \"5f7a5687d67051eafcfb7cb5ac542143a325a135403daeca6595602bfd400441\"\nsha256 cellar: :any, big_sur: \"c910acffd3369bf5c4e0cff112efe6d56035394639b9571d845ad5ecb4dbd01f\"\n+ sha256 cellar: :any, arm64_big_sur: \"d7c04f2f95e459cb8639e99fb998311adc1d0babfd026987a1dcecf1e77e1f96\"\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Add arm64 Big Sur tezos-sapling-params bottle
Problem: tezos-sapling-params formula is used as a dependency for the
rest of the formulae with Octez binaries. However, we don't have arm64
Big Sur bottle for it.
Solution: Since this formula isn't updated automatically, provide
the corresponding bottle hash manually.
|
603,658
|
21.12.2021 09:39:06
| -7,200
|
ad2c38baa85adfc3403ea0e75e2222bfb13db0a3
|
[Chore] Fix static_libs.patch
Problem: our static libs patch doesn't apply anymore because of some
changes to the source dune files.
Solution: as we actually only need the patch for tezos-sandbox now,
fixed its patch and removed everything else.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-diff --git a/src/bin_client/dune b/src/bin_client/dune\n-index 00fb3a632..923739d2b 100644\n---- a/src/bin_client/dune\n-+++ b/src/bin_client/dune\n-@@ -76,7 +76,9 @@\n- -open Tezos_client_commands\n- -open Tezos_mockup_commands\n- -open Tezos_client_base_unix\n-- -linkall)))\n-+ -linkall\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-\n- (rule\n- (action\n-diff --git a/src/bin_codec/dune b/src/bin_codec/dune\n-index f7577c4e5..949d2cbc4 100644\n---- a/src/bin_codec/dune\n-+++ b/src/bin_codec/dune\n-@@ -33,7 +33,9 @@\n- -open Tezos_clic\n- -open Tezos_stdlib_unix\n- -open Tezos_event_logging\n-- -linkall)))\n-+ -linkall\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-\n- (rule\n- (action\n-diff --git a/src/bin_node/dune b/src/bin_node/dune\n-index 95a8d1af7..ce2ac8e3e 100644\n---- a/src/bin_node/dune\n-+++ b/src/bin_node/dune\n-@@ -96,7 +96,8 @@\n- -open Tezos_shell_context\n- -open Tezos_workers\n- -open Tezos_protocol_updater\n-- -linkall)))\n-+ -linkall\n-+ -ccopt -static)))\n-\n- (rule\n- (action\n-diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n-index 26c1fa638..029a50c07 100644\n---- a/src/bin_signer/dune\n-+++ b/src/bin_signer/dune\n-@@ -21,4 +21,6 @@\n- -open Tezos_rpc_http_server\n- -open Tezos_rpc_http_client_unix\n- -open Tezos_stdlib_unix\n-- -open Tezos_stdlib)))\n-+ -open Tezos_stdlib\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-diff --git a/src/proto_010_PtGRANAD/bin_accuser/dune b/src/proto_010_PtGRANAD/bin_accuser/dune\n-index 11c77973e3..43515f16ed 100644\n---- a/src/proto_010_PtGRANAD/bin_accuser/dune\n-+++ b/src/proto_010_PtGRANAD/bin_accuser/dune\n-@@ -10,4 +10,6 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_010_PtGRANAD_commands\n- -open Tezos_stdlib_unix\n-- -open Tezos_client_base_unix)))\n-+ -open Tezos_client_base_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-diff --git a/src/proto_010_PtGRANAD/bin_baker/dune b/src/proto_010_PtGRANAD/bin_baker/dune\n-index 0535edf13c..f0c85ad447 100644\n---- a/src/proto_010_PtGRANAD/bin_baker/dune\n-+++ b/src/proto_010_PtGRANAD/bin_baker/dune\n-@@ -10,4 +10,6 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_010_PtGRANAD_commands\n- -open Tezos_stdlib_unix\n-- -open Tezos_client_base_unix)))\n-+ -open Tezos_client_base_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-diff --git a/src/proto_010_PtGRANAD/bin_endorser/dune b/src/proto_010_PtGRANAD/bin_endorser/dune\n-index c19a310a8f..6c38226293 100644\n---- a/src/proto_010_PtGRANAD/bin_endorser/dune\n-+++ b/src/proto_010_PtGRANAD/bin_endorser/dune\n-@@ -10,4 +10,6 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_010_PtGRANAD_commands\n- -open Tezos_stdlib_unix\n-- -open Tezos_client_base_unix)))\n-+ -open Tezos_client_base_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-diff --git a/src/proto_011_PtHangz2/bin_accuser/dune b/src/proto_011_PtHangz2/bin_accuser/dune\n-index 11c77973e3..43515f16ed 100644\n---- a/src/proto_011_PtHangz2/bin_accuser/dune\n-+++ b/src/proto_011_PtHangz2/bin_accuser/dune\n-@@ -10,4 +10,6 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_011_PtHangz2_commands\n- -open Tezos_stdlib_unix\n-- -open Tezos_client_base_unix)))\n-+ -open Tezos_client_base_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-diff --git a/src/proto_011_PtHangz2/bin_baker/dune b/src/proto_011_PtHangz2/bin_baker/dune\n-index 0535edf13c..f0c85ad447 100644\n---- a/src/proto_011_PtHangz2/bin_baker/dune\n-+++ b/src/proto_011_PtHangz2/bin_baker/dune\n-@@ -10,4 +10,6 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_011_PtHangz2_commands\n- -open Tezos_stdlib_unix\n-- -open Tezos_client_base_unix)))\n-+ -open Tezos_client_base_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n-diff --git a/src/proto_011_PtHangz2/bin_endorser/dune b/src/proto_011_PtHangz2/bin_endorser/dune\n-index c19a310a8f..6c38226293 100644\n---- a/src/proto_011_PtHangz2/bin_endorser/dune\n-+++ b/src/proto_011_PtHangz2/bin_endorser/dune\n-@@ -10,4 +10,6 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_011_PtHangz2_commands\n- -open Tezos_stdlib_unix\n-- -open Tezos_client_base_unix)))\n-+ -open Tezos_client_base_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\ndiff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\n-index 6289c6d124..aa2eb20a29 100644\n+index 90d65b78a..b6fd1eb08 100644\n--- a/src/bin_sandbox/dune\n+++ b/src/bin_sandbox/dune\n-@@ -2,4 +2,5 @@\n- (names main)\n- (libraries tezos-base\n+@@ -4,4 +4,5 @@\n+ tezos-base\ntezos-base.unix\n+ fmt\n- flextesa))\n+ flextesa)\n+ (flags :standard -ccopt -static))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix static_libs.patch
Problem: our static libs patch doesn't apply anymore because of some
changes to the source dune files.
Solution: as we actually only need the patch for tezos-sandbox now,
fixed its patch and removed everything else.
|
603,658
|
21.12.2021 10:02:01
| -7,200
|
f5931a619bc89bf92226a645763cb56344ea1580
|
[Chore] Delete stdlib-unix.patch
Problem: stdlib-unix.patch doesn't seem to be necessary anymore,
and might in fact break our builds.
Solution: binned the rubbish
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -182,7 +182,7 @@ rec {\ntezos-protocol-compiler = osuper.tezos-protocol-compiler.overrideAttrs\n(oa: rec {\nbuildInputs = oa.buildInputs ++\n- [ oself.pprint rustc-bls12-381 tezos-stdlib-unix ocp-ocamlres tezos-protocol-environment-sigs\n+ [ oself.pprint rustc-bls12-381 ocp-ocamlres tezos-protocol-environment-sigs\ntezos-base re tezos-version\n];\npropagatedBuildInputs = buildInputs;\n@@ -319,10 +319,6 @@ rec {\nXDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n});\n- # FIXME apply this patch upstream\n- tezos-stdlib-unix = osuper.tezos-stdlib-unix.overrideAttrs\n- (_: { patches = [ ./stdlib-unix.patch ]; });\n-\ntezos-client = osuper.tezos-client.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [\n"
},
{
"change_type": "DELETE",
"old_path": "nix/build/stdlib-unix.patch",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-diff --git a/src/lib_stdlib_unix/file_descriptor_sink.ml b/src/lib_stdlib_unix/file_descriptor_sink.ml\n-index 781668770..124dbaaef 100644\n---- a/file_descriptor_sink.ml\n-+++ b/file_descriptor_sink.ml\n-@@ -24,6 +24,7 @@\n- (*****************************************************************************)\n-\n- open Error_monad\n-+open Fmt\n-\n- type t = {\n- output : Lwt_unix.file_descr;\n-@@ -142,7 +143,7 @@ end) : Internal_event.SINK with type t = t = struct\n- Ezjsonm.value_to_string ~minify:true event_json ^ \"\\n\"\n- | `Netstring ->\n- let bytes = Ezjsonm.value_to_string ~minify:true event_json in\n-- Fmt.str \"%d:%s,\" (String.length bytes) bytes\n-+ Fmt.strf \"%d:%s,\" (String.length bytes) bytes\n- in\n- protect (fun () ->\n- (*\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Delete stdlib-unix.patch
Problem: stdlib-unix.patch doesn't seem to be necessary anymore,
and might in fact break our builds.
Solution: binned the rubbish
|
603,652
|
22.12.2021 11:30:30
| -10,800
|
478c8326b5bbed3a02669f46c460d8feebaa0395
|
[Chore] Update native packages building
Problem: The structure of the tezos/tezos repository has slightly
changed, and now '.opam' files that we're interested in are located
in 'tezt' subdirectory. Also Octez now depends on 'libpq'.
Solution: Update 'build-binary.sh' script and list of runtime
dependencies for the packages.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile-fedora",
"new_path": "docker/package/Dockerfile-fedora",
"diff": "FROM fedora:32\nRUN dnf update -y\n-RUN dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel m4 perl git pkg-config \\\n+RUN dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 perl git pkg-config \\\nrpmdevtools python3 wget opam rsync which cargo autoconf\nENV USER dockerbuilder\nRUN useradd dockerbuilder && mkdir /tezos-packaging\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile-ubuntu",
"new_path": "docker/package/Dockerfile-ubuntu",
"diff": "FROM ubuntu:20.04\nENV DEBIAN_FRONTEND=\"noninteractive\"\n-RUN apt-get update && apt-get install -y libev-dev libgmp-dev libhidapi-dev libffi-dev zlib1g-dev m4 perl pkg-config \\\n+RUN apt-get update && apt-get install -y libev-dev libgmp-dev libhidapi-dev libffi-dev zlib1g-dev libpq-dev m4 perl pkg-config \\\ndebhelper dh-make dh-systemd devscripts autotools-dev python3 python3-distutils wget rsync\nRUN apt-get install -y software-properties-common\nRUN add-apt-repository ppa:ubuntu-mozilla-security/rust-next -y && apt-get update && apt-get -y install cargo\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -44,7 +44,14 @@ package_to_build = args.package\nsource_archive = args.sources\nif is_ubuntu:\n- run_deps = [\"libev-dev\", \"libgmp-dev\", \"libhidapi-dev\", \"libffi-dev\", \"zlib1g-dev\"]\n+ run_deps = [\n+ \"libev-dev\",\n+ \"libgmp-dev\",\n+ \"libhidapi-dev\",\n+ \"libffi-dev\",\n+ \"zlib1g-dev\",\n+ \"libpq-dev\",\n+ ]\nelse:\nrun_deps = [\n\"libev-devel\",\n@@ -52,6 +59,7 @@ else:\n\"hidapi-devel\",\n\"libffi-devel\",\n\"zlib-devel\",\n+ \"libpq-devel\",\n]\nbuild_deps = [\n\"make\",\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/build-binary.sh",
"new_path": "docker/package/scripts/build-binary.sh",
"diff": "@@ -16,7 +16,7 @@ cd tezos\nopam init local ../opam-repository --bare --disable-sandboxing\nopam switch create . --repositories=local\neval \"$(opam env)\"\n-opams=\"$(find ./vendors ./src -name \\*.opam -print)\"\n+opams=\"$(find ./vendors ./src ./tezt -name \\*.opam -print)\"\nopam install $opams --deps-only --criteria=\"-notuptodate,-changed,-removed\"\neval \"$(opam env)\"\ndune build \"$dune_filepath\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Update native packages building
Problem: The structure of the tezos/tezos repository has slightly
changed, and now '.opam' files that we're interested in are located
in 'tezt' subdirectory. Also Octez now depends on 'libpq'.
Solution: Update 'build-binary.sh' script and list of runtime
dependencies for the packages.
|
603,652
|
23.12.2021 15:25:01
| -10,800
|
af7a2c5be0a2326cfdb10565966316eea2677678
|
[Chore] Fix tezos-baking package dependencies
Problem: There is on endorser daemon in 012 protocol. However,
'tezos-baking' package ended up depending on 'tezos-endorser-012-psithaca'.
As a result, it's impossible to install/upgrade tezos-baking-12.0-rc1-0ubuntu1 :(
Solution: Remove dependency on 'tezos-endorser-012-psithaca' package.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -487,6 +487,7 @@ class TezosBakingServicesPackage(AbstractPackage):\nself.meta = deepcopy(meta)\nself.meta.version = self.meta.version + self.letter_version\nself.target_protos = set()\n+ self.noendorser_protos = protocols[\"active_noendorser\"]\nfor network in target_networks:\nfor proto in network_protos[network]:\nself.target_protos.add(proto)\n@@ -495,7 +496,7 @@ class TezosBakingServicesPackage(AbstractPackage):\nrequires = [f\"tezos-node-{network}.service\"]\nfor proto in network_protos[network]:\nrequires.append(f\"tezos-baker-{proto.lower()}@{network}.service\")\n- if proto not in protocols[\"active_noendorser\"]:\n+ if proto not in self.noendorser_protos:\nrequires.append(f\"tezos-endorser-{proto.lower()}@{network}.service\")\nself.systemd_units.append(\nSystemdUnit(\n@@ -537,19 +538,12 @@ class TezosBakingServicesPackage(AbstractPackage):\nshutil.copy(f\"{os.path.dirname(__file__)}/tezos_setup_wizard.py\", out_dir)\ndef gen_control_file(self, deps, ubuntu_version, out):\n- run_deps = \", \".join(\n- [\"acl\", \"tezos-client\", \"tezos-node\"]\n- + sum(\n- [\n- [\n- f\"tezos-{daemon}-{proto.lower()}\"\n- for daemon in [\"baker\", \"endorser\"]\n- ]\n- for proto in self.target_protos\n- ],\n- [],\n- )\n- )\n+ run_deps_list = [\"acl\", \"tezos-client\", \"tezos-node\"]\n+ for proto in self.target_protos:\n+ run_deps_list.append(f\"tezos-baker-{proto.lower()}\")\n+ if proto not in self.noendorser_protos:\n+ run_deps_list.append(f\"tezos-endorser-{proto.lower()}\")\n+ run_deps = \", \".join(run_deps_list)\nfile_contents = f\"\"\"\nSource: {self.name}\nSection: utils\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix tezos-baking package dependencies
Problem: There is on endorser daemon in 012 protocol. However,
'tezos-baking' package ended up depending on 'tezos-endorser-012-psithaca'.
As a result, it's impossible to install/upgrade tezos-baking-12.0-rc1-0ubuntu1 :(
Solution: Remove dependency on 'tezos-endorser-012-psithaca' package.
|
603,658
|
12.01.2022 20:40:28
| -3,600
|
3e9700679ef1c0e6a54d677ece5f31c259668d1f
|
[Chore] Remove ithaca mentions as v11.1 doesn't support it
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -13,11 +13,10 @@ from .model import (\nfrom .systemd import Service, ServiceFile, SystemdUnit, Unit, Install\n-networks = [\"mainnet\", \"hangzhounet\", \"ithacanet\"]\n+networks = [\"mainnet\", \"hangzhounet\"]\nnetworks_protos = {\n\"mainnet\": [\"011-PtHangz2\"],\n\"hangzhounet\": [\"011-PtHangz2\"],\n- \"ithacanet\": [\"012-PsiThaCa\"],\n}\nsigner_units = [\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/tezos_setup_wizard.py",
"new_path": "docker/package/tezos_setup_wizard.py",
"diff": "@@ -22,7 +22,6 @@ from typing import List\nnetworks = {\n\"mainnet\": \"Main Tezos network\",\n\"hangzhounet\": \"Test network using version 011 of Tezos protocol (Hangzhou)\",\n- \"ithacanet\": \"Test network using version 012 of Tezos protocol (Ithaca)\",\n}\nmodes = {\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -245,9 +245,6 @@ rec {\ntezos-protocol-011-PtHangz2 = osuper.tezos-protocol-011-PtHangz2.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n- tezos-protocol-012-PsiThaCa = osuper.tezos-protocol-012-PsiThaCa.overrideAttrs (o : {\n- buildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n- });\ntezos-protocol-demo-noops = osuper.tezos-protocol-demo-noops.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n@@ -275,9 +272,6 @@ rec {\ntezos-protocol-plugin-011-PtHangz2 = osuper.tezos-protocol-plugin-011-PtHangz2.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n- tezos-protocol-plugin-012-PsiThaCa = osuper.tezos-protocol-plugin-012-PsiThaCa.overrideAttrs (o : {\n- buildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n- });\n# packages depend on rust library\ntezos-validator = osuper.tezos-validator.overrideAttrs\n@@ -324,11 +318,6 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\nXDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n});\n- tezos-protocol-012-PsiThaCa-parameters = osuper.tezos-protocol-012-PsiThaCa-parameters.overrideAttrs\n- (o: rec {\n- buildInputs = o.buildInputs ++ [ librustzcash ];\n- XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n- });\ntezos-client = osuper.tezos-client.overrideAttrs\n(o: {\n@@ -349,17 +338,14 @@ rec {\ntezos-client-009-PsFLoren-commands-registration\ntezos-client-010-PtGRANAD-commands-registration\ntezos-client-011-PtHangz2-commands-registration\n- tezos-client-012-PsiThaCa-commands-registration\ntezos-client-alpha-commands-registration\ntezos-baking-011-PtHangz2-commands\n- tezos-baking-012-PsiThaCa-commands\ntezos-baking-alpha-commands\ntezos-protocol-plugin-007-PsDELPH1\ntezos-protocol-plugin-008-PtEdo2Zk\ntezos-protocol-plugin-009-PsFLoren\ntezos-protocol-plugin-010-PtGRANAD\ntezos-protocol-plugin-011-PtHangz2\n- tezos-protocol-plugin-012-PsiThaCa\ntezos-protocol-plugin-alpha\n];\npostInstall = \"rm $bin/tezos-admin-client $bin/*.sh\";\n@@ -381,16 +367,6 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-accuser-012-PsiThaCa = osuper.tezos-accuser-012-PsiThaCa.overrideAttrs\n- (o: {\n- buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n- postFixup = zcash-post-fixup o;\n- });\n- tezos-baker-012-PsiThaCa = osuper.tezos-baker-012-PsiThaCa.overrideAttrs\n- (o: {\n- buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n- postFixup = zcash-post-fixup o;\n- });\ntezos-codec = osuper.tezos-codec.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 librustzcash self.makeWrapper ];\n@@ -434,14 +410,12 @@ rec {\ntezos-embedded-protocol-009-PsFLoren\ntezos-embedded-protocol-010-PtGRANAD\ntezos-embedded-protocol-011-PtHangz2\n- tezos-embedded-protocol-012-PsiThaCa\ntezos-embedded-protocol-alpha\ntezos-protocol-plugin-007-PsDELPH1-registerer\ntezos-protocol-plugin-008-PtEdo2Zk-registerer\ntezos-protocol-plugin-009-PsFLoren-registerer\ntezos-protocol-plugin-010-PtGRANAD-registerer\ntezos-protocol-plugin-011-PtHangz2-registerer\n- tezos-protocol-plugin-012-PsiThaCa-registerer\ntezos-protocol-plugin-alpha-registerer\n];\npostInstall = \"rm $bin/*.sh\";\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/modules/common.nix",
"new_path": "nix/modules/common.nix",
"diff": "@@ -22,7 +22,7 @@ rec {\ndaemonOptions = sharedOptions // {\nbaseProtocol = mkOption {\n- type = types.enum [ \"011-PtHangz2\" \"012-PsiThaCa\" ];\n+ type = types.enum [ \"011-PtHangz2\" ];\ndescription = ''\nBase protocol version.\n'';\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/modules/tezos-accuser.nix",
"new_path": "nix/modules/tezos-accuser.nix",
"diff": "@@ -10,8 +10,6 @@ let\ntezos-accuser-pkgs = {\n\"011-PtHangz2\" =\n\"${pkgs.ocamlPackages.tezos-accuser-011-PtHangz2}/bin/tezos-accuser-011-PtHangz2\";\n- \"012-PsiThaCa\" =\n- \"${pkgs.ocamlPackages.tezos-accuser-012-PsiThaCa}/bin/tezos-accuser-012-PsiThaCa\";\n};\ncfg = config.services.tezos-accuser;\ncommon = import ./common.nix { inherit lib; inherit pkgs; };\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/modules/tezos-baker.nix",
"new_path": "nix/modules/tezos-baker.nix",
"diff": "@@ -10,8 +10,6 @@ let\ntezos-baker-pkgs = {\n\"011-PtHangz2\" =\n\"${pkgs.ocamlPackages.tezos-baker-011-PtHangz2}/bin/tezos-baker-011-PtHangz2\";\n- \"012-PsiThaCa\" =\n- \"${pkgs.ocamlPackages.tezos-baker-012-PsiThaCa}/bin/tezos-baker-012-PsiThaCa\";\n};\ncfg = config.services.tezos-baker;\ncommon = import ./common.nix { inherit lib; inherit pkgs; };\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "\"010-PtGRANAD\"\n],\n\"active\": [\n- \"011-PtHangz2\",\n- \"012-PsiThaCa\"\n+ \"011-PtHangz2\"\n],\n\"active_noendorser\": [\n- \"012-PsiThaCa\"\n]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/build-bottles.sh",
"new_path": "scripts/build-bottles.sh",
"diff": "@@ -18,10 +18,10 @@ brew install --formula ./Formula/tezos-sapling-params.rb\n# we don't bottle meta-formulas that contains only services\nbuild_bottle ./Formula/tezos-accuser-011-PtHangz2.rb\n-build_bottle ./Formula/tezos-accuser-012-PsiThaCa.rb\n+#build_bottle ./Formula/tezos-accuser-012-PsiThaCa.rb\nbuild_bottle ./Formula/tezos-admin-client.rb\nbuild_bottle ./Formula/tezos-baker-011-PtHangz2.rb\n-build_bottle ./Formula/tezos-baker-012-PsiThaCa.rb\n+#build_bottle ./Formula/tezos-baker-012-PsiThaCa.rb\nbuild_bottle ./Formula/tezos-client.rb\nbuild_bottle ./Formula/tezos-codec.rb\nbuild_bottle ./Formula/tezos-endorser-011-PtHangz2.rb\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -76,8 +76,8 @@ def test_node_with_daemons_scenario(network, use_tls=False):\nkill_node_with_daemons()\n-with subtest(\"run node with daemons on ithacanet\"):\n- test_node_with_daemons_scenario(\"ithacanet\")\n+with subtest(\"run node with daemons on hangzhounet\"):\n+ test_node_with_daemons_scenario(\"hangzhounet\")\nwith subtest(\"run node with daemons on mainnet\"):\ntest_node_with_daemons_scenario(\"mainnet\")\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-binaries.nix",
"new_path": "tests/tezos-binaries.nix",
"diff": "@@ -17,9 +17,9 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\ntestScript = ''\npath_to_binaries = \"${path-to-binaries}\"\n- tezos_accuser = f\"{path_to_binaries}/tezos-accuser-012-PsiThaCa\"\n+ tezos_accuser = f\"{path_to_binaries}/tezos-accuser-011-PtHangz2\"\ntezos_admin_client = f\"{path_to_binaries}/tezos-admin-client\"\n- tezos_baker = f\"{path_to_binaries}/tezos-baker-012-PsiThaCa\"\n+ tezos_baker = f\"{path_to_binaries}/tezos-baker-011-PtHangz2\"\ntezos_client = f\"{path_to_binaries}/tezos-client\"\ntezos_node = f\"{path_to_binaries}/tezos-node\"\ntezos_signer = f\"{path_to_binaries}/tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-modules.nix",
"new_path": "tests/tezos-modules.nix",
"diff": "@@ -17,21 +17,21 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n../nix/modules/tezos-baker.nix\n];\n- services.tezos-node.instances.ithacanet.enable = true;\n+ services.tezos-node.instances.hangzhounet.enable = true;\n- services.tezos-signer.instances.ithacanet = {\n+ services.tezos-signer.instances.hangzhounet = {\nenable = true;\nnetworkProtocol = \"http\";\n};\n- services.tezos-accuser.instances.ithacanet = {\n+ services.tezos-accuser.instances.hangzhounet = {\nenable = true;\n- baseProtocol = \"012-PsiThaCa\";\n+ baseProtocol = \"011-PtHangz2\";\n};\n- services.tezos-baker.instances.ithacanet = {\n+ services.tezos-baker.instances.hangzhounet = {\nenable = true;\n- baseProtocol = \"012-PsiThaCa\";\n+ baseProtocol = \"011-PtHangz2\";\n};\n};\n@@ -47,7 +47,7 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n]\nfor s in services:\n- machine.wait_for_unit(f\"tezos-ithacanet-{s}.service\")\n+ machine.wait_for_unit(f\"tezos-hangzhounet-{s}.service\")\nwith subtest(\"check tezos-node rpc response\"):\nmachine.wait_for_open_port(8732)\n@@ -57,6 +57,6 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\nwith subtest(\"service status sanity check\"):\nfor s in services:\n- machine.succeed(f\"systemctl status tezos-ithacanet-{s}.service\")\n+ machine.succeed(f\"systemctl status tezos-hangzhounet-{s}.service\")\n'';\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-nix-binaries.nix",
"new_path": "tests/tezos-nix-binaries.nix",
"diff": "@@ -5,7 +5,7 @@ let\nnixpkgs = (import ../nix/nix/sources.nix).nixpkgs;\npkgs = import ../nix/build/pkgs.nix {};\ninherit (pkgs.ocamlPackages) tezos-client tezos-admin-client tezos-node tezos-signer tezos-codec\n- tezos-accuser-012-PsiThaCa tezos-baker-012-PsiThaCa;\n+ tezos-accuser-011-PtHangz2 tezos-baker-011-PtHangz2;\nin import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n{\nnodes.machine = { ... }: {\n@@ -20,9 +20,9 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n};\ntestScript = ''\n- tezos_accuser = \"${tezos-accuser-012-PsiThaCa}/bin/tezos-accuser-012-PsiThaCa\"\n+ tezos_accuser = \"${tezos-accuser-011-PtHangz2}/bin/tezos-accuser-011-PtHangz2\"\ntezos_admin_client = \"${tezos-admin-client}/bin/tezos-admin-client\"\n- tezos_baker = \"${tezos-baker-012-PsiThaCa}/bin/tezos-baker-012-PsiThaCa\"\n+ tezos_baker = \"${tezos-baker-011-PtHangz2}/bin/tezos-baker-011-PtHangz2\"\ntezos_client = (\n\"${tezos-client}/bin/tezos-client\"\n)\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Remove ithaca mentions as v11.1 doesn't support it
|
603,658
|
12.01.2022 22:03:24
| -3,600
|
faaf17d2c3c82b62339d7a6206910ae659ee4f4f
|
[Chore] Fix static_libs.patch for v11.1
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "@@ -5,10 +5,10 @@ diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\nindex 90d65b78a..b6fd1eb08 100644\n--- a/src/bin_sandbox/dune\n+++ b/src/bin_sandbox/dune\n-@@ -4,4 +4,5 @@\n- tezos-base\n+@@ -2,4 +2,5 @@\n+ (names main)\n+ (libraries tezos-base\ntezos-base.unix\n- fmt\n- flextesa))\n+ flextesa)\n+ (flags :standard -ccopt -static))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix static_libs.patch for v11.1
|
603,652
|
17.01.2022 13:38:09
| -10,800
|
fad225ef8f2cf7f841fb87be5cd8808a72a210da
|
[Chore] Remove ithaca support from formulae
Problem: v11.1 doesn't support ithaca. However, we have ithaca-related
formulae.
Solution: Remove ithaca-related formulae.
|
[
{
"change_type": "DELETE",
"old_path": "Formula/tezos-accuser-012-PsiThaCa.rb",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-class TezosAccuser012Psithaca < Formula\n- @all_bins = []\n-\n- class << self\n- attr_accessor :all_bins\n- end\n- homepage \"https://gitlab.com/tezos/tezos\"\n-\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.1\", :shallow => false\n-\n- version \"v11.1-1\"\n-\n- build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\n- build_dependencies.each do |dependency|\n- depends_on dependency => :build\n- end\n-\n- dependencies = %w[gmp hidapi libev libffi]\n- dependencies.each do |dependency|\n- depends_on dependency\n- end\n- desc \"Daemon for accusing\"\n-\n- bottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser012Psithaca.version}/\"\n- end\n-\n- def make_deps\n- ENV.deparallelize\n- ENV[\"CARGO_HOME\"]=\"./.cargo\"\n- # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer\n- arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n- 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\"\n- system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n- ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n- system \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\n- system [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n- end\n-\n- def install_template(dune_path, exec_path, name)\n- bin.mkpath\n- self.class.all_bins << name\n- system [\"eval $(opam env)\", \"dune build #{dune_path}\", \"cp #{exec_path} #{name}\"].join(\" && \")\n- bin.install name\n- end\n-\n- def install\n- startup_contents =\n- <<~EOS\n- #!/usr/bin/env bash\n-\n- set -euo pipefail\n-\n- accuser=\"#{bin}/tezos-accuser-012-PsiThaCa\"\n-\n- accuser_dir=\"$DATA_DIR\"\n-\n- accuser_config=\"$accuser_dir/config\"\n- mkdir -p \"$accuser_dir\"\n-\n- if [ ! -f \"$accuser_config\" ]; then\n- \"$accuser\" --base-dir \"$accuser_dir\" \\\n- --endpoint \"$NODE_RPC_ENDPOINT\" \\\n- config init --output \"$accuser_config\" >/dev/null 2>&1\n- else\n- \"$accuser\" --base-dir \"$accuser_dir\" \\\n- --endpoint \"$NODE_RPC_ENDPOINT\" \\\n- config update >/dev/null 2>&1\n- fi\n-\n- exec \"$accuser\" --base-dir \"$accuser_dir\" \\\n- --endpoint \"$NODE_RPC_ENDPOINT\" \\\n- run\n- EOS\n- File.write(\"tezos-accuser-012-PsiThaCa-start\", startup_contents)\n- bin.install \"tezos-accuser-012-PsiThaCa-start\"\n- make_deps\n- install_template \"src/proto_012_PsiThaCa/bin_accuser/main_accuser_012_PsiThaCa.exe\",\n- \"_build/default/src/proto_012_PsiThaCa/bin_accuser/main_accuser_012_PsiThaCa.exe\",\n- \"tezos-accuser-012-PsiThaCa\"\n- end\n-\n- plist_options manual: \"tezos-accuser-012-PsiThaCa run\"\n- def plist\n- <<~EOS\n- <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n- <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"\n- \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n- <plist version=\"1.0\">\n- <dict>\n- <key>Label</key>\n- <string>#{plist_name}</string>\n- <key>Program</key>\n- <string>#{opt_bin}/tezos-accuser-012-PsiThaCa-start</string>\n- <key>EnvironmentVariables</key>\n- <dict>\n- <key>DATA_DIR</key>\n- <string>#{var}/lib/tezos/client</string>\n- <key>NODE_RPC_ENDPOINT</key>\n- <string>http://localhost:8732</string>\n- </dict>\n- <key>RunAtLoad</key><true/>\n- <key>StandardOutPath</key>\n- <string>#{var}/log/#{name}.log</string>\n- <key>StandardErrorPath</key>\n- <string>#{var}/log/#{name}.log</string>\n- </dict>\n- </plist>\n- EOS\n- end\n- def post_install\n- mkdir \"#{var}/lib/tezos/client\"\n- end\n-end\n"
},
{
"change_type": "DELETE",
"old_path": "Formula/tezos-baker-012-PsiThaCa.rb",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-class TezosBaker012Psithaca < Formula\n- @all_bins = []\n-\n- class << self\n- attr_accessor :all_bins\n- end\n- homepage \"https://gitlab.com/tezos/tezos\"\n-\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v11.1\", :shallow => false\n-\n- version \"v11.1-1\"\n-\n- build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\n- build_dependencies.each do |dependency|\n- depends_on dependency => :build\n- end\n-\n- dependencies = %w[gmp hidapi libev libffi tezos-sapling-params]\n- dependencies.each do |dependency|\n- depends_on dependency\n- end\n- desc \"Daemon for baking\"\n-\n- bottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker012Psithaca.version}/\"\n- end\n-\n- def make_deps\n- ENV.deparallelize\n- ENV[\"CARGO_HOME\"]=\"./.cargo\"\n- # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n- arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n- 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\"\n- system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n- ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n- system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n- system \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\n- system [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n- end\n-\n- def install_template(dune_path, exec_path, name)\n- bin.mkpath\n- self.class.all_bins << name\n- system [\"eval $(opam env)\", \"dune build #{dune_path}\", \"cp #{exec_path} #{name}\"].join(\" && \")\n- bin.install name\n- end\n-\n- def install\n- startup_contents =\n- <<~EOS\n- #!/usr/bin/env bash\n-\n- set -euo pipefail\n-\n- baker=\"#{bin}/tezos-baker-012-PsiThaCa\"\n-\n- baker_dir=\"$DATA_DIR\"\n-\n- baker_config=\"$baker_dir/config\"\n- mkdir -p \"$baker_dir\"\n-\n- if [ ! -f \"$baker_config\" ]; then\n- \"$baker\" --base-dir \"$baker_dir\" \\\n- --endpoint \"$NODE_RPC_ENDPOINT\" \\\n- config init --output \"$baker_config\" >/dev/null 2>&1\n- else\n- \"$baker\" --base-dir \"$baker_dir\" \\\n- --endpoint \"$NODE_RPC_ENDPOINT\" \\\n- config update >/dev/null 2>&1\n- fi\n-\n- launch_baker() {\n- exec \"$baker\" \\\n- --base-dir \"$baker_dir\" --endpoint \"$NODE_RPC_ENDPOINT\" \\\n- run with local node \"$NODE_DATA_DIR\" \"$@\"\n- }\n-\n- if [[ -z \"$BAKER_ACCOUNT\" ]]; then\n- launch_baker\n- else\n- launch_baker \"$BAKER_ACCOUNT\"\n- fi\n- EOS\n- File.write(\"tezos-baker-012-PsiThaCa-start\", startup_contents)\n- bin.install \"tezos-baker-012-PsiThaCa-start\"\n- make_deps\n- install_template \"src/proto_012_PsiThaCa/bin_baker/main_baker_012_PsiThaCa.exe\",\n- \"_build/default/src/proto_012_PsiThaCa/bin_baker/main_baker_012_PsiThaCa.exe\",\n- \"tezos-baker-012-PsiThaCa\"\n- end\n- plist_options manual: \"tezos-baker-012-PsiThaCa run with local node\"\n- def plist\n- <<~EOS\n- <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n- <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"\n- \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n- <plist version=\"1.0\">\n- <dict>\n- <key>Label</key>\n- <string>#{plist_name}</string>\n- <key>Program</key>\n- <string>#{opt_bin}/tezos-baker-012-PsiThaCa-start</string>\n- <key>EnvironmentVariables</key>\n- <dict>\n- <key>DATA_DIR</key>\n- <string>#{var}/lib/tezos/client</string>\n- <key>NODE_DATA_DIR</key>\n- <string></string>\n- <key>NODE_RPC_ENDPOINT</key>\n- <string>http://localhost:8732</string>\n- <key>BAKER_ACCOUNT</key>\n- <string></string>\n- </dict>\n- <key>RunAtLoad</key><true/>\n- <key>StandardOutPath</key>\n- <string>#{var}/log/#{name}.log</string>\n- <key>StandardErrorPath</key>\n- <string>#{var}/log/#{name}.log</string>\n- </dict>\n- </plist>\n- EOS\n- end\n- def post_install\n- mkdir \"#{var}/lib/tezos/client\"\n- end\n-end\n"
},
{
"change_type": "DELETE",
"old_path": "Formula/tezos-node-ithacanet.rb",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-class TezosNodeIthacanet < Formula\n- url \"file:///dev/null\"\n- version \"v11.1-1\"\n-\n- bottle :unneeded\n- depends_on \"tezos-node\"\n-\n- desc \"Meta formula that provides background tezos-node service that runs on ithacanet\"\n-\n- def install\n- startup_contents =\n- <<~EOS\n- #!/usr/bin/env bash\n-\n- set -euo pipefail\n-\n- node=\"/usr/local/bin/tezos-node\"\n- # default location of the config file\n- config_file=\"$DATA_DIR/config.json\"\n-\n- mkdir -p \"$DATA_DIR\"\n- if [[ ! -f \"$config_file\" ]]; then\n- echo \"Configuring the node...\"\n- \"$node\" config init \\\n- --data-dir \"$DATA_DIR\" \\\n- --rpc-addr \"$NODE_RPC_ADDR\" \\\n- --network=ithacanet \\\n- \"$@\"\n- else\n- echo \"Updating the node configuration...\"\n- \"$node\" config update \\\n- --data-dir \"$DATA_DIR\" \\\n- --rpc-addr \"$NODE_RPC_ADDR\" \\\n- --network=ithacanet \\\n- \"$@\"\n- fi\n-\n- # Launching the node\n- if [[ -z \"$CERT_PATH\" || -z \"$KEY_PATH\" ]]; then\n- exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\"\n- else\n- exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\" \\\n- --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\n- fi\n- EOS\n- File.write(\"tezos-node-ithacanet-start\", startup_contents)\n- bin.install \"tezos-node-ithacanet-start\"\n- print \"Installing tezos-node-ithacanet service\"\n- end\n- def plist\n- <<~EOS\n- <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n- <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"\n- \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n- <plist version=\"1.0\">\n- <dict>\n- <key>Label</key>\n- <string>#{plist_name}</string>\n- <key>Program</key>\n- <string>#{opt_bin}/tezos-node-ithacanet-start</string>\n- <key>EnvironmentVariables</key>\n- <dict>\n- <key>DATA_DIR</key>\n- <string>#{var}/lib/tezos/node-ithacanet</string>\n- <key>NODE_RPC_ADDR</key>\n- <string>127.0.0.1:8732</string>\n- <key>CERT_PATH</key>\n- <string></string>\n- <key>KEY_PATH</key>\n- <string></string>\n- </dict>\n- <key>RunAtLoad</key><true/>\n- <key>StandardOutPath</key>\n- <string>#{var}/log/#{name}.log</string>\n- <key>StandardErrorPath</key>\n- <string>#{var}/log/#{name}.log</string>\n- </dict>\n- </plist>\n- EOS\n- end\n- def post_install\n- mkdir_p \"#{var}/lib/tezos/node-ithacanet\"\n- system \"tezos-node\", \"config\", \"init\", \"--data-dir\" \"#{var}/lib/tezos/node-ithacanet\", \"--network\", \"ithacanet\"\n- end\n-end\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Remove ithaca support from formulae
Problem: v11.1 doesn't support ithaca. However, we have ithaca-related
formulae.
Solution: Remove ithaca-related formulae.
Signed-off-by: Roman Melnikov <roman.melnikov@serokell.io>
|
603,652
|
17.01.2022 13:05:51
| -10,800
|
a473c4884f71a0a4b85dc1f3874fd5521826c5f1
|
Wait for node to shutdown before cleaning
Problem: Sometimes binaries tests are failing due to inability to clean
up node data directory.
Solution: Clean up may fail in case node didn't shut down completely
before removing the data directory.
Wait for node process to die before the data directory removal.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -20,7 +20,6 @@ def pkill_background(binary):\ndef run_node(network, use_tls):\n- machine.succeed(\"rm -rf node-dir\")\nmachine.succeed(\"mkdir node-dir\")\ntls_args = \" --rpc-tls=\" + host_cert + \",\" + host_key + \" \" if use_tls else \" \"\nmachine.succeed(f\"{tezos_node} config init --data-dir node-dir --network {network}\")\n@@ -61,6 +60,9 @@ def kill_node_with_daemons():\npkill_background(\"tezos-accuser\")\npkill_background(\"tezos-baker\")\npkill_background(\"tezos-node\")\n+ # Waiting node process to be killed before cleaning up to avoid race-conditions\n+ machine.wait_until_fails(\"pgrep tezos-node\")\n+ machine.succeed(\"rm -rf node-dir\")\ndef test_node_with_daemons_scenario(network, use_tls=False):\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#339] Wait for node to shutdown before cleaning
Problem: Sometimes binaries tests are failing due to inability to clean
up node data directory.
Solution: Clean up may fail in case node didn't shut down completely
before removing the data directory.
Wait for node process to die before the data directory removal.
|
603,658
|
25.01.2022 00:09:55
| -3,600
|
9627d4f30f9595934b908645b4d100168f52973a
|
[Chore] Fix static_libs.patch for v12.0-rc2
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "@@ -5,10 +5,10 @@ diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\nindex 90d65b78a..b6fd1eb08 100644\n--- a/src/bin_sandbox/dune\n+++ b/src/bin_sandbox/dune\n-@@ -2,4 +2,5 @@\n- (names main)\n- (libraries tezos-base\n+@@ -4,4 +4,5 @@\n+ tezos-base\ntezos-base.unix\n+ fmt\n- flextesa))\n+ flextesa)\n+ (flags :standard -ccopt -static))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix static_libs.patch for v12.0-rc2
|
603,658
|
25.01.2022 00:45:00
| -3,600
|
1ee946f0b46d2b0d2acad0f4369dab8b6a14403e
|
[Chore] Support Ithaca protocol and testnet
Problem: new '012-Psithaca' protocol has been proposed, so we need
to support it and its testnet.
Solution: added the support, except for tezos-endorser as Ithaca
isn't supposed to have those.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/generate-tags-pipeline.sh",
"new_path": ".buildkite/generate-tags-pipeline.sh",
"diff": "@@ -15,7 +15,7 @@ ymlappend () {\n}\n# we don't bottle meta-formulas that contain only services\n-formulae=(\"tezos-accuser-011-PtHangz2\" \"tezos-admin-client\" \"tezos-baker-011-PtHangz2\" \"tezos-client\" \"tezos-codec\" \"tezos-endorser-011-PtHangz2\" \"tezos-node\" \"tezos-sandbox\" \"tezos-signer\")\n+formulae=(\"tezos-accuser-011-PtHangz2\" \"tezos-accuser-012-Psithaca\" \"tezos-admin-client\" \"tezos-baker-011-PtHangz2\" \"tezos-baker-012-Psithaca\" \"tezos-client\" \"tezos-codec\" \"tezos-endorser-011-PtHangz2\" \"tezos-node\" \"tezos-sandbox\" \"tezos-signer\")\n# tezos-sapling-params is used as a dependency for some of the formulas\n# so we handle it separately.\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/build-bottles.yml",
"new_path": ".github/workflows/build-bottles.yml",
"diff": "@@ -16,7 +16,7 @@ jobs:\nmatrix:\nos: [ { id: macos-10.15, name: \"catalina\" }, { id: macos-11, name: \"big_sur\" } ]\n# we don't bottle meta-formulas that contain only services\n- formula: [tezos-accuser-011-PtHangz2, tezos-admin-client, tezos-baker-011-PtHangz2, tezos-client, tezos-codec, tezos-endorser-011-PtHangz2, tezos-node, tezos-sandbox, tezos-signer]\n+ formula: [tezos-accuser-011-PtHangz2, tezos-accuser-012-Psithaca, tezos-admin-client, tezos-baker-011-PtHangz2, tezos-baker-012-Psithaca, tezos-client, tezos-codec, tezos-endorser-011-PtHangz2, tezos-node, tezos-sandbox, tezos-signer]\nsteps:\n- name: Checkout\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-accuser-012-Psithaca.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosAccuser012Psithaca < Formula\n+ @all_bins = []\n+\n+ class << self\n+ attr_accessor :all_bins\n+ end\n+ homepage \"https://gitlab.com/tezos/tezos\"\n+\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v12.0-rc2\", :shallow => false\n+\n+ version \"v12.0-rc2-1\"\n+\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\n+ build_dependencies.each do |dependency|\n+ depends_on dependency => :build\n+ end\n+\n+ dependencies = %w[gmp hidapi libev libffi]\n+ dependencies.each do |dependency|\n+ depends_on dependency\n+ end\n+ desc \"Daemon for accusing\"\n+\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser012Psithaca.version}/\"\n+ end\n+\n+ def make_deps\n+ ENV.deparallelize\n+ ENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\n+ system [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n+ end\n+\n+ def install_template(dune_path, exec_path, name)\n+ bin.mkpath\n+ self.class.all_bins << name\n+ system [\"eval $(opam env)\", \"dune build #{dune_path}\", \"cp #{exec_path} #{name}\"].join(\" && \")\n+ bin.install name\n+ end\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ accuser=\"#{bin}/tezos-accuser-012-Psithaca\"\n+\n+ accuser_dir=\"$DATA_DIR\"\n+\n+ accuser_config=\"$accuser_dir/config\"\n+ mkdir -p \"$accuser_dir\"\n+\n+ if [ ! -f \"$accuser_config\" ]; then\n+ \"$accuser\" --base-dir \"$accuser_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ config init --output \"$accuser_config\" >/dev/null 2>&1\n+ else\n+ \"$accuser\" --base-dir \"$accuser_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ config update >/dev/null 2>&1\n+ fi\n+\n+ exec \"$accuser\" --base-dir \"$accuser_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ run\n+ EOS\n+ File.write(\"tezos-accuser-012-Psithaca-start\", startup_contents)\n+ bin.install \"tezos-accuser-012-Psithaca-start\"\n+ make_deps\n+ install_template \"src/proto_012_Psithaca/bin_accuser/main_accuser_012_Psithaca.exe\",\n+ \"_build/default/src/proto_012_Psithaca/bin_accuser/main_accuser_012_Psithaca.exe\",\n+ \"tezos-accuser-012-Psithaca\"\n+ end\n+\n+ plist_options manual: \"tezos-accuser-012-Psithaca run\"\n+ def plist\n+ <<~EOS\n+ <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+ <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"\n+ \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n+ <plist version=\"1.0\">\n+ <dict>\n+ <key>Label</key>\n+ <string>#{plist_name}</string>\n+ <key>Program</key>\n+ <string>#{opt_bin}/tezos-accuser-012-Psithaca-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{var}/lib/tezos/client</string>\n+ <key>NODE_RPC_ENDPOINT</key>\n+ <string>http://localhost:8732</string>\n+ </dict>\n+ <key>RunAtLoad</key><true/>\n+ <key>StandardOutPath</key>\n+ <string>#{var}/log/#{name}.log</string>\n+ <key>StandardErrorPath</key>\n+ <string>#{var}/log/#{name}.log</string>\n+ </dict>\n+ </plist>\n+ EOS\n+ end\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/client\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-baker-012-Psithaca.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosBaker012Psithaca < Formula\n+ @all_bins = []\n+\n+ class << self\n+ attr_accessor :all_bins\n+ end\n+ homepage \"https://gitlab.com/tezos/tezos\"\n+\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v12.0-rc2\", :shallow => false\n+\n+ version \"v12.0-rc2-1\"\n+\n+ build_dependencies = %w[pkg-config autoconf rsync wget rustup-init]\n+ build_dependencies.each do |dependency|\n+ depends_on dependency => :build\n+ end\n+\n+ dependencies = %w[gmp hidapi libev libffi tezos-sapling-params]\n+ dependencies.each do |dependency|\n+ depends_on dependency\n+ end\n+ desc \"Daemon for baking\"\n+\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker012Psithaca.version}/\"\n+ end\n+\n+ def make_deps\n+ ENV.deparallelize\n+ ENV[\"CARGO_HOME\"]=\"./.cargo\"\n+ # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer\n+ arch = RUBY_PLATFORM.include?(\"arm64\") ? \"arm64\" : \"x86_64\"\n+ 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\"\n+ system \"chmod\", \"+x\", \"#{ENV[\"HOME\"]}/.opam-bin/opam\"\n+ ENV[\"PATH\"]=\"#{ENV[\"HOME\"]}/.opam-bin:#{ENV[\"PATH\"]}\"\n+ system \"rustup-init\", \"--default-toolchain\", \"1.52.1\", \"-y\"\n+ system \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\n+ system [\"source .cargo/env\", \"make build-deps\"].join(\" && \")\n+ end\n+\n+ def install_template(dune_path, exec_path, name)\n+ bin.mkpath\n+ self.class.all_bins << name\n+ system [\"eval $(opam env)\", \"dune build #{dune_path}\", \"cp #{exec_path} #{name}\"].join(\" && \")\n+ bin.install name\n+ end\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ baker=\"#{bin}/tezos-baker-012-Psithaca\"\n+\n+ baker_dir=\"$DATA_DIR\"\n+\n+ baker_config=\"$baker_dir/config\"\n+ mkdir -p \"$baker_dir\"\n+\n+ if [ ! -f \"$baker_config\" ]; then\n+ \"$baker\" --base-dir \"$baker_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ config init --output \"$baker_config\" >/dev/null 2>&1\n+ else\n+ \"$baker\" --base-dir \"$baker_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ config update >/dev/null 2>&1\n+ fi\n+\n+ launch_baker() {\n+ exec \"$baker\" \\\n+ --base-dir \"$baker_dir\" --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ run with local node \"$NODE_DATA_DIR\" \"$@\"\n+ }\n+\n+ if [[ -z \"$BAKER_ACCOUNT\" ]]; then\n+ launch_baker\n+ else\n+ launch_baker \"$BAKER_ACCOUNT\"\n+ fi\n+ EOS\n+ File.write(\"tezos-baker-012-Psithaca-start\", startup_contents)\n+ bin.install \"tezos-baker-012-Psithaca-start\"\n+ make_deps\n+ install_template \"src/proto_012_Psithaca/bin_baker/main_baker_012_Psithaca.exe\",\n+ \"_build/default/src/proto_012_Psithaca/bin_baker/main_baker_012_Psithaca.exe\",\n+ \"tezos-baker-012-Psithaca\"\n+ end\n+ plist_options manual: \"tezos-baker-012-Psithaca run with local node\"\n+ def plist\n+ <<~EOS\n+ <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+ <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"\n+ \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n+ <plist version=\"1.0\">\n+ <dict>\n+ <key>Label</key>\n+ <string>#{plist_name}</string>\n+ <key>Program</key>\n+ <string>#{opt_bin}/tezos-baker-012-Psithaca-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{var}/lib/tezos/client</string>\n+ <key>NODE_DATA_DIR</key>\n+ <string></string>\n+ <key>NODE_RPC_ENDPOINT</key>\n+ <string>http://localhost:8732</string>\n+ <key>BAKER_ACCOUNT</key>\n+ <string></string>\n+ </dict>\n+ <key>RunAtLoad</key><true/>\n+ <key>StandardOutPath</key>\n+ <string>#{var}/log/#{name}.log</string>\n+ <key>StandardErrorPath</key>\n+ <string>#{var}/log/#{name}.log</string>\n+ </dict>\n+ </plist>\n+ EOS\n+ end\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/client\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-node-ithacanet.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosNodeHangzhounet < Formula\n+ url \"file:///dev/null\"\n+ version \"v12.0-rc2-1\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-node\"\n+\n+ desc \"Meta formula that provides background tezos-node service that runs on ithacanet\"\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ node=\"/usr/local/bin/tezos-node\"\n+ # default location of the config file\n+ config_file=\"$DATA_DIR/config.json\"\n+\n+ mkdir -p \"$DATA_DIR\"\n+ if [[ ! -f \"$config_file\" ]]; then\n+ echo \"Configuring the node...\"\n+ \"$node\" config init \\\n+ --data-dir \"$DATA_DIR\" \\\n+ --rpc-addr \"$NODE_RPC_ADDR\" \\\n+ --network=ithacanet \\\n+ \"$@\"\n+ else\n+ echo \"Updating the node configuration...\"\n+ \"$node\" config update \\\n+ --data-dir \"$DATA_DIR\" \\\n+ --rpc-addr \"$NODE_RPC_ADDR\" \\\n+ --network=ithacanet \\\n+ \"$@\"\n+ fi\n+\n+ # Launching the node\n+ if [[ -z \"$CERT_PATH\" || -z \"$KEY_PATH\" ]]; then\n+ exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\"\n+ else\n+ exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\" \\\n+ --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\n+ fi\n+ EOS\n+ File.write(\"tezos-node-ithacanet-start\", startup_contents)\n+ bin.install \"tezos-node-ithacanet-start\"\n+ print \"Installing tezos-node-ithacanet service\"\n+ end\n+ def plist\n+ <<~EOS\n+ <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+ <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"\n+ \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n+ <plist version=\"1.0\">\n+ <dict>\n+ <key>Label</key>\n+ <string>#{plist_name}</string>\n+ <key>Program</key>\n+ <string>#{opt_bin}/tezos-node-ithacanet-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{var}/lib/tezos/node-ithacanet</string>\n+ <key>NODE_RPC_ADDR</key>\n+ <string>127.0.0.1:8732</string>\n+ <key>CERT_PATH</key>\n+ <string></string>\n+ <key>KEY_PATH</key>\n+ <string></string>\n+ </dict>\n+ <key>RunAtLoad</key><true/>\n+ <key>StandardOutPath</key>\n+ <string>#{var}/log/#{name}.log</string>\n+ <key>StandardErrorPath</key>\n+ <string>#{var}/log/#{name}.log</string>\n+ </dict>\n+ </plist>\n+ EOS\n+ end\n+ def post_install\n+ mkdir_p \"#{var}/lib/tezos/node-ithacanet\"\n+ system \"tezos-node\", \"config\", \"init\", \"--data-dir\" \"#{var}/lib/tezos/node-ithacanet\", \"--network\", \"ithacanet\"\n+ end\n+end\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -13,10 +13,11 @@ from .model import (\nfrom .systemd import Service, ServiceFile, SystemdUnit, Unit, Install\n-networks = [\"mainnet\", \"hangzhounet\"]\n+networks = [\"mainnet\", \"hangzhounet\", \"ithacanet\"]\nnetworks_protos = {\n\"mainnet\": [\"011-PtHangz2\"],\n\"hangzhounet\": [\"011-PtHangz2\"],\n+ \"ithacanet\": [\"012-Psithaca\"],\n}\nsigner_units = [\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/tezos_setup_wizard.py",
"new_path": "docker/package/tezos_setup_wizard.py",
"diff": "@@ -22,6 +22,7 @@ from typing import List\nnetworks = {\n\"mainnet\": \"Main Tezos network\",\n\"hangzhounet\": \"Test network using version 011 of Tezos protocol (Hangzhou)\",\n+ \"ithacanet\": \"Test network using version 012 of Tezos protocol (Ithaca2)\",\n}\nmodes = {\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -245,6 +245,9 @@ rec {\ntezos-protocol-011-PtHangz2 = osuper.tezos-protocol-011-PtHangz2.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n+ tezos-protocol-012-Psithaca = osuper.tezos-protocol-012-Psithaca.overrideAttrs (o : {\n+ buildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n+ });\ntezos-protocol-demo-noops = osuper.tezos-protocol-demo-noops.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n@@ -272,6 +275,9 @@ rec {\ntezos-protocol-plugin-011-PtHangz2 = osuper.tezos-protocol-plugin-011-PtHangz2.overrideAttrs (o : {\nbuildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n});\n+ tezos-protocol-plugin-012-Psithaca = osuper.tezos-protocol-plugin-012-Psithaca.overrideAttrs (o : {\n+ buildInputs = o.buildInputs ++ [ tezos-protocol-environment ];\n+ });\n# packages depend on rust library\ntezos-validator = osuper.tezos-validator.overrideAttrs\n@@ -318,6 +324,11 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\nXDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n});\n+ tezos-protocol-012-Psithaca-parameters = osuper.tezos-protocol-012-Psithaca-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\ntezos-client = osuper.tezos-client.overrideAttrs\n(o: {\n@@ -338,6 +349,7 @@ rec {\ntezos-client-009-PsFLoren-commands-registration\ntezos-client-010-PtGRANAD-commands-registration\ntezos-client-011-PtHangz2-commands-registration\n+ tezos-client-012-Psithaca-commands-registration\ntezos-client-alpha-commands-registration\ntezos-baking-011-PtHangz2-commands\ntezos-baking-alpha-commands\n@@ -346,6 +358,7 @@ rec {\ntezos-protocol-plugin-009-PsFLoren\ntezos-protocol-plugin-010-PtGRANAD\ntezos-protocol-plugin-011-PtHangz2\n+ tezos-protocol-plugin-012-Psithaca\ntezos-protocol-plugin-alpha\n];\npostInstall = \"rm $bin/tezos-admin-client $bin/*.sh\";\n@@ -357,11 +370,21 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n+ tezos-accuser-012-Psithaca = osuper.tezos-accuser-012-Psithaca.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\ntezos-baker-011-PtHangz2 = osuper.tezos-baker-011-PtHangz2.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n+ tezos-baker-012-Psithaca = osuper.tezos-baker-012-Psithaca.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\ntezos-endorser-011-PtHangz2 = osuper.tezos-endorser-011-PtHangz2.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n@@ -410,12 +433,14 @@ rec {\ntezos-embedded-protocol-009-PsFLoren\ntezos-embedded-protocol-010-PtGRANAD\ntezos-embedded-protocol-011-PtHangz2\n+ tezos-embedded-protocol-012-Psithaca\ntezos-embedded-protocol-alpha\ntezos-protocol-plugin-007-PsDELPH1-registerer\ntezos-protocol-plugin-008-PtEdo2Zk-registerer\ntezos-protocol-plugin-009-PsFLoren-registerer\ntezos-protocol-plugin-010-PtGRANAD-registerer\ntezos-protocol-plugin-011-PtHangz2-registerer\n+ tezos-protocol-plugin-012-Psithaca-registerer\ntezos-protocol-plugin-alpha-registerer\n];\npostInstall = \"rm $bin/*.sh\";\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/modules/common.nix",
"new_path": "nix/modules/common.nix",
"diff": "@@ -22,7 +22,7 @@ rec {\ndaemonOptions = sharedOptions // {\nbaseProtocol = mkOption {\n- type = types.enum [ \"011-PtHangz2\" ];\n+ type = types.enum [ \"011-PtHangz2\" \"012-Psithaca\" ];\ndescription = ''\nBase protocol version.\n'';\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/modules/tezos-accuser.nix",
"new_path": "nix/modules/tezos-accuser.nix",
"diff": "@@ -10,6 +10,8 @@ let\ntezos-accuser-pkgs = {\n\"011-PtHangz2\" =\n\"${pkgs.ocamlPackages.tezos-accuser-011-PtHangz2}/bin/tezos-accuser-011-PtHangz2\";\n+ \"012-Psithaca\" =\n+ \"${pkgs.ocamlPackages.tezos-accuser-012-Psithaca}/bin/tezos-accuser-012-Psithaca\";\n};\ncfg = config.services.tezos-accuser;\ncommon = import ./common.nix { inherit lib; inherit pkgs; };\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/modules/tezos-baker.nix",
"new_path": "nix/modules/tezos-baker.nix",
"diff": "@@ -10,6 +10,8 @@ let\ntezos-baker-pkgs = {\n\"011-PtHangz2\" =\n\"${pkgs.ocamlPackages.tezos-baker-011-PtHangz2}/bin/tezos-baker-011-PtHangz2\";\n+ \"012-Psithaca\" =\n+ \"${pkgs.ocamlPackages.tezos-baker-012-Psithaca}/bin/tezos-baker-012-Psithaca\";\n};\ncfg = config.services.tezos-baker;\ncommon = import ./common.nix { inherit lib; inherit pkgs; };\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "\"010-PtGRANAD\"\n],\n\"active\": [\n- \"011-PtHangz2\"\n+ \"011-PtHangz2\",\n+ \"012-Psithaca\"\n],\n\"active_noendorser\": [\n+ \"012-Psithaca\"\n]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -78,8 +78,8 @@ def test_node_with_daemons_scenario(network, use_tls=False):\nkill_node_with_daemons()\n-with subtest(\"run node with daemons on hangzhounet\"):\n- test_node_with_daemons_scenario(\"hangzhounet\")\n+with subtest(\"run node with daemons on ithacanet\"):\n+ test_node_with_daemons_scenario(\"ithacanet\")\nwith subtest(\"run node with daemons on mainnet\"):\ntest_node_with_daemons_scenario(\"mainnet\")\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-binaries.nix",
"new_path": "tests/tezos-binaries.nix",
"diff": "@@ -17,9 +17,9 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\ntestScript = ''\npath_to_binaries = \"${path-to-binaries}\"\n- tezos_accuser = f\"{path_to_binaries}/tezos-accuser-011-PtHangz2\"\n+ tezos_accuser = f\"{path_to_binaries}/tezos-accuser-012-Psithaca\"\ntezos_admin_client = f\"{path_to_binaries}/tezos-admin-client\"\n- tezos_baker = f\"{path_to_binaries}/tezos-baker-011-PtHangz2\"\n+ tezos_baker = f\"{path_to_binaries}/tezos-baker-012-Psithaca\"\ntezos_client = f\"{path_to_binaries}/tezos-client\"\ntezos_node = f\"{path_to_binaries}/tezos-node\"\ntezos_signer = f\"{path_to_binaries}/tezos-signer\"\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-modules.nix",
"new_path": "tests/tezos-modules.nix",
"diff": "@@ -17,21 +17,21 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n../nix/modules/tezos-baker.nix\n];\n- services.tezos-node.instances.hangzhounet.enable = true;\n+ services.tezos-node.instances.ithacanet.enable = true;\n- services.tezos-signer.instances.hangzhounet = {\n+ services.tezos-signer.instances.ithacanet = {\nenable = true;\nnetworkProtocol = \"http\";\n};\n- services.tezos-accuser.instances.hangzhounet = {\n+ services.tezos-accuser.instances.ithacanet = {\nenable = true;\n- baseProtocol = \"011-PtHangz2\";\n+ baseProtocol = \"012-Psithaca\";\n};\n- services.tezos-baker.instances.hangzhounet = {\n+ services.tezos-baker.instances.ithacanet = {\nenable = true;\n- baseProtocol = \"011-PtHangz2\";\n+ baseProtocol = \"012-Psithaca\";\n};\n};\n@@ -47,7 +47,7 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n]\nfor s in services:\n- machine.wait_for_unit(f\"tezos-hangzhounet-{s}.service\")\n+ machine.wait_for_unit(f\"tezos-ithacanet-{s}.service\")\nwith subtest(\"check tezos-node rpc response\"):\nmachine.wait_for_open_port(8732)\n@@ -57,6 +57,6 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\nwith subtest(\"service status sanity check\"):\nfor s in services:\n- machine.succeed(f\"systemctl status tezos-hangzhounet-{s}.service\")\n+ machine.succeed(f\"systemctl status tezos-ithacanet-{s}.service\")\n'';\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-nix-binaries.nix",
"new_path": "tests/tezos-nix-binaries.nix",
"diff": "@@ -5,7 +5,7 @@ let\nnixpkgs = (import ../nix/nix/sources.nix).nixpkgs;\npkgs = import ../nix/build/pkgs.nix {};\ninherit (pkgs.ocamlPackages) tezos-client tezos-admin-client tezos-node tezos-signer tezos-codec\n- tezos-accuser-011-PtHangz2 tezos-baker-011-PtHangz2;\n+ tezos-accuser-012-Psithaca tezos-baker-012-Psithaca;\nin import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n{\nnodes.machine = { ... }: {\n@@ -20,9 +20,9 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n};\ntestScript = ''\n- tezos_accuser = \"${tezos-accuser-011-PtHangz2}/bin/tezos-accuser-011-PtHangz2\"\n+ tezos_accuser = \"${tezos-accuser-012-Psithaca}/bin/tezos-accuser-012-Psithaca\"\ntezos_admin_client = \"${tezos-admin-client}/bin/tezos-admin-client\"\n- tezos_baker = \"${tezos-baker-011-PtHangz2}/bin/tezos-baker-011-PtHangz2\"\n+ tezos_baker = \"${tezos-baker-012-Psithaca}/bin/tezos-baker-012-Psithaca\"\ntezos_client = (\n\"${tezos-client}/bin/tezos-client\"\n)\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Support Ithaca protocol and testnet
Problem: new '012-Psithaca' protocol has been proposed, so we need
to support it and its testnet.
Solution: added the support, except for tezos-endorser as Ithaca
isn't supposed to have those.
|
603,658
|
25.01.2022 16:16:46
| -3,600
|
4c11f903d1bde05e1f08c98e03035dc3f8b48623
|
[Chore] Update nix README
Problem: `nix build -f.` is difficult to use now because of disabled
experimental `nix-command` features.
Solution: changed instructions to use `nix-build -A`.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/README.md",
"new_path": "nix/README.md",
"diff": "In order to build all binaries run:\n```bash\n-nix build -f. binaries\n+nix-build -A binaries\n```\nAs an alternative you can build single binary:\n```\n-nix build -f. binaries.tezos-client\n+nix-build -A binaries.tezos-client\n```\nThis will produce `tezos-client` binary.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Update nix README
Problem: `nix build -f.` is difficult to use now because of disabled
experimental `nix-command` features.
Solution: changed instructions to use `nix-build -A`.
|
603,658
|
25.01.2022 16:18:33
| -3,600
|
0a3ae3f08645b8399c633fb664a8683acd7daefb
|
[Chore] Fix update-tezos.sh
Problem: sometimes opam_repository_tag isn't updated correctly because
we source it from the master branch of the tezos repo, not from the
tag we need.
Solution: added checking out the relevant tag before sourcing version.sh.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/update-tezos.sh",
"new_path": "scripts/update-tezos.sh",
"diff": "@@ -19,6 +19,7 @@ git clone https://gitlab.com/tezos/tezos.git upstream-repo\ncd upstream-repo\nlatest_upstream_tag_hash=\"$(git rev-list --tags --max-count=1)\"\nlatest_upstream_tag=\"$(git describe --tags \"$latest_upstream_tag_hash\")\"\n+git checkout $latest_upstream_tag\nsource scripts/version.sh\ncd ..\nrm -rf upstream-repo\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix update-tezos.sh
Problem: sometimes opam_repository_tag isn't updated correctly because
we source it from the master branch of the tezos repo, not from the
tag we need.
Solution: added checking out the relevant tag before sourcing version.sh.
|
603,658
|
26.01.2022 00:06:13
| -3,600
|
c42b343b4f376bbfa47d3bde80961eb5f9a1812b
|
[Chore] Add v12.0-rc2-1 hashes to brew formulae for Big Sur arm64
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"new_path": "Formula/tezos-accuser-011-PtHangz2.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosAccuser011Pthangz2 < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser011Pthangz2.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"d98c8c477142a258217b2bb693567300a7ad58e6feb3ece5f1d8a7bd5c9d91c2\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-012-Psithaca.rb",
"new_path": "Formula/tezos-accuser-012-Psithaca.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosAccuser012Psithaca < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser012Psithaca.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"0db7e9e561da6e3d7a61161cbec7f72ece1ba62e61cd957afea107ef31c8af3f\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"b79b33de7c42f86b9c5c26e3d2857f44bbe653604f0a77eeb8ce12471fe3c0ae\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-011-PtHangz2.rb",
"new_path": "Formula/tezos-baker-011-PtHangz2.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosBaker011Pthangz2 < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker011Pthangz2.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"2d748cf7c93add9f5c179233c0204ff72983d715b42e5e2d35d91e1c2bf759f8\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-012-Psithaca.rb",
"new_path": "Formula/tezos-baker-012-Psithaca.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosBaker012Psithaca < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker012Psithaca.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"76191aae7c364365707df775458257cf46bc25fc6913a27f3037d5e7310bf8a4\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"e95e99633e9f8d37ac0a9fa9c33ffc5ea2e6e9a154a12cd6170494fd460aeeb0\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"b3ebd24859f786d8c069f81c2a382ba52e5d0231df83135b21d9071cc1ea2599\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"new_path": "Formula/tezos-endorser-011-PtHangz2.rb",
"diff": "@@ -28,6 +28,7 @@ class TezosEndorser011Pthangz2 < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser011Pthangz2.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"b6baf5c2120c53c54487b7f13d2802467fc3e6c4ae780e2cede1239c64202db6\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"593dccdcfcde55fc57a8c95715169a142478ee86f02c27055dbea30cfceb4e36\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"0f27b3f4bd300d9627fd86096035b3822bf5f5e94fc167ea556d1631a0540d47\"\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -27,6 +27,7 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\n+ sha256 cellar: :any, arm64_big_sur: \"446cfe397a6e63ef1fc4044a287f8f01b476a93dc8fdf3a654c2d283613a6e11\"\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Add v12.0-rc2-1 hashes to brew formulae for Big Sur arm64
|
603,658
|
26.01.2022 00:48:34
| -3,600
|
34fdeeb7559a93be0db5920b54ed9fd6ada0437c
|
[Chore] Fix BK bottle building
Problem: buildkite docs state that local directories are created when
downloading artifacts, but in our case it isn't for some reason :(
Solution: create the needed directory ourselves before downloading bottles.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/generate-tags-pipeline.sh",
"new_path": ".buildkite/generate-tags-pipeline.sh",
"diff": "@@ -64,7 +64,8 @@ ymlappend \" agents:\n- \\\"uninstall-tsp\\\"\nif: build.tag =~ /^v.*/\ncommands:\n- - buildkite-agent artifact download \\\"*bottle.tar.gz\\\" \\\"Big Sur arm64\\\"\n+ - mkdir -p \\\"Big Sur arm64\\\"\n+ - buildkite-agent artifact download \\\"*bottle.tar.gz\\\" \\\"Big Sur arm64/\\\"\n- nix-shell ./scripts/shell.nix\n--run './scripts/sync-bottle-hashes.sh \\\"\\$BUILDKITE_TAG\\\" \\\"Big Sur arm64\\\"'\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[Chore] Fix BK bottle building
Problem: buildkite docs state that local directories are created when
downloading artifacts, but in our case it isn't for some reason :(
Solution: create the needed directory ourselves before downloading bottles.
|
603,652
|
16.12.2021 13:12:46
| -10,800
|
84bf30298f01dcdcabbced5af573438a9bd59849
|
Add release support policy doc
Problem: We haven't documented anywhere which specific versions of the
Ubuntu, Fedora, and macOS we support.
Solution: Write a doc that explains which versions of the OSes are
supported by the packages from tezos-packaging and reference it in
README.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -40,6 +40,8 @@ the binaries, and the services used.\n- [**Fedora**](./docs/distros/fedora.md)\n- [**macOS**](./docs/distros/macos.md)\n+The information about supported versions of the aforementioned OSes is available in the [support policy doc](./docs/support-policy.md).\n+\nAdditionally, prebuilt **static binaries** can be downloaded directly from the\n[latest release](https://github.com/serokell/tezos-packaging/releases/latest)\nfor other linux distros.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/support-policy.md",
"diff": "+<!--\n+ - SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+ -\n+ - SPDX-License-Identifier: LicenseRef-MIT-TQ\n+ -->\n+# Packages support policy\n+\n+`tezos-packaging` provides packages for Ubuntu, Fedora and macOS for each stable and release-candidate\n+version of Octez.\n+\n+This document describes which versions of the aforementioned OSes are targeted\n+by our packages.\n+\n+## Ubuntu packages\n+\n+We aim to provide packages for all [Ubuntu LTS releases](https://wiki.ubuntu.com/Releases)\n+supported by Canonical.\n+\n+Currently, these are versions:\n+* 18.04 LTS (Bionic Beaver)\n+* 20.04 LTS (Focal Fossa)\n+\n+When feasible, we also provide support for non-LTS versions on request from the users.\n+Currently:\n+* 21.04 (Hirsute Hippo) - requested in [#212](https://github.com/serokell/tezos-packaging/issues/212)\n+\n+There are packages for `arm64` and `amd64` architectures.\n+\n+## Fedora packages\n+\n+We aim to provide packages for all [currently supported Fedora releases](https://docs.fedoraproject.org/en-US/releases/).\n+\n+Currently, these are versions:\n+* Fedora 34, both `x86_64` and `aarch64`\n+* Fedora 35, only `aarch64`. `x86_64` is currently unsupported due to [tezos/#1449](https://gitlab.com/tezos/tezos/-/issues/1449)\n+\n+There are packages for `x86_64` and `aarch64` architectures.\n+\n+## macOS brew formulae\n+\n+Brew formulae provided by `tezos-packaging` aim to support all maintained macOS versions:\n+* macOS 10.15 (Catalina)\n+* macOS 11 (Big Sur)\n+* macOS 12 (Monterey)\n+\n+Unfortunately, an ability to provide pre-compiled brew bottles for formulae has\n+a hard dependency on the available build infrastructure. At the moment, the only macOS\n+versions for which we provide brew bottles are:\n+* macOS 11 (Big Sur) both `x86_64` and `arm64`\n+* macOS 10.15 (Catalina) only `x86_64`\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#307] Add release support policy doc
Problem: We haven't documented anywhere which specific versions of the
Ubuntu, Fedora, and macOS we support.
Solution: Write a doc that explains which versions of the OSes are
supported by the packages from tezos-packaging and reference it in
README.
|
603,652
|
16.12.2021 17:05:55
| -10,800
|
f812abc07188c8ad76a600f3be63848bd2ccbcb9
|
Document release process
Problem: It's non-trivial for an external observer (or a newcomer
maintainer) to find out how the autoreleasing works in tezos-packaging.
Solution: Add a doc that contains a graph which describes the steps of
the release process and how they're triggered.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -56,6 +56,11 @@ This repository provides two distinct ways for building and packaging tezos bina\n* [Docker-based](./docker/README.md)\n* [Nix-based](./nix/README.md)\n+## Release process\n+\n+Please see the [release workflow doc](./docs/release-workflow.md) for more information about the details of the `tezos-packaging`\n+releasing process.\n+\n## For Contributors\nPlease see [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more information.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/release-graph.svg.license",
"diff": "+SPDX-FileCopyrightText: 2021 Tocqueville Group\n+\n+SPDX-License-Identifier: LicenseRef-MIT-TQ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/release-graph.xml",
"diff": "+<mxfile host=\"app.diagrams.net\" modified=\"2022-01-27T13:32:19.378Z\" agent=\"5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36\" etag=\"iyOpCODRDcinN3Y1UP4y\" version=\"16.4.0\" type=\"device\"><diagram id=\"voVWhZEqSa-_gdvtVahE\" name=\"Page-1\">7Vxbc5s4FP41nn1Kx0KA7cfaSdPdpts02U43Tx0ZFFstRh4h4ri/vhIIDEi+1MaYOJ3JxHBAMjrfuXw6Eu7A0ez5mqH59CP1cdCxuv5zB152LAvYltWRf11/mUp6NkgFE0Z8ddNKcE9+YiXsKmlMfByVbuSUBpzMy0KPhiH2eEmGGKOL8m2PNCh/6xxNsCa491CgS78Sn09Tad/qreTvMZlMs28G7iC9MkPZzWok0RT5dFEQwasOHDFKeXo0ex7hQCov00va7t2aq/mDMRzyXRr8c/P8mQx7FwuXfPv45erhA/gPXwA1jicUxGrEt/E4INFUCEPEyRNOvsT7IQYaJcqX/6ZSGnE0DuTBDYpDbzpHvji+vX0rNR/K4xGdM9ma0e8SmlQLfJmpltE49LF8um4HDhdTwvG9+CZ5dSGMScimfBaIMyAOH0kQjGhAWdIW+g7u+7aQR5zRH7hwpW+NoeuKK7p+lMqeMOP4uSBS+rrGdIY5W4pb1NWBwjKzXUedL1aWADJ4pwUrcJUMKeOb5D2v8BEHCqLfgau/P1x3o3OGyu22DSvL1dSIfRFb1GlIQ/ExLGuWMj6lExqi4IbSudLnd8z5UkVGFAtES9rGz4T/L5u/cdTZQ+HK5bPqOTlZZiehGGChkTx9KF5bNUvOsnZrcYpozDy8SRkqDXDEJphvutFJb5Sq2og7w0Fq76WIXzuIluZww5gE0mWGDC/Ex5hyHkhfk+4VzwOa+JZwuVnZ/TyGEcfy2jXh7+OxOOj0hnOGLzq9SzEYjCL8Av0OOnbF7/rN+R348u4zhZ/85YfBR++aPdjvo28XOmIc/6TRRRoVSThJjSfVt4x4Ho4iTfNi+FzTnfLZoqKVqAgDDbnyVsvOzlXH8rrULREE421AJqGQzYjvy4tDpASeQAOzeuDJNL8snxbAgQMDOPaxwHE1cDqWG0hNC4dwJ/LgFrNHymaJq4zlUEZ/Z/eIr8xv0xArQGByFEEQOSKhVGxyD8NezCIRQO5wlKLVTe4KAjSPyDjIJCsX3M/HEPMya4A1pTpnK6jAbRJUnZRsBHWGwhgFwbK1qD4+PlqeZ0LVd8eu0wyqvVOjCvRAupHQrLjL1Up6OL/ZiXMYBzDQKYd5oN1TUY5Nj11Q+70YwiZOvs45dtHi/pkemOKOKdMfz0K7mqr+TTjZJ0+k/EKah+907U3pbBxH2zV3aPyvQ/OwPLcxRnzHoPn+0TSv5/GviAgb7dryEYRn6oyq/VwW2JXECne08ONx2V1icOi/lYUuyRwDFEXEW2fApakfKE38VvPAQ6Z+G710exx2647DquktJSEvcuIyzLAKXzok1apYUat0lDdc11E6ZK2jxBTy8RxgHVCPf9SYo2/QGAcJPRKsCK1oUMFMtNnH2nnK+oioJkMGW9lk3Kp0qx6rk0e3HRy3mYxsmWYt9XjhbxZgzMWevL5jLvZs5WgH+LZbN8cqhFpTRstkB4YA0K9EemvPEGCDckdg0HAI0NniKCk0lYoct3edtBbloplMtOE4kh+FukhWFpnr8aP9ebvKTKF96rwNdWZ6oojRQN7ObPBP3t7VOoBmHQ9YJ8ytTdyZdbc+cUOdIN3hJ5LMEdN1rxkWSGuxssYIuEMt6QgR0D59BLTbEgH3WSDbP2pau1adMttsCSPKlwEyC9qXEcEKI7K7DQdX5ywNryVmYgOnhK5TRXd34lzpqFolrM9MzDspdKuobym+3jhjfH6ohxnzOHe1n2bW04FtpDnH2hQB2oTErgG/GSR0anSf7ec68/K5Aw1bFI5VPjfvKgGaQl/v1qD6I9Samo9TNoN8p0pDGSer1v4BvQD69v1gVquiJtCn7nm9LUzmlfnurtWUckH4NAFePKAnDsYkRIwYZvztL7VZoOxEbpPbvcwG0tXU+IrdqnaOYY6lrnviWNosjXwZoL+4WKpT0HWxVG6TPct4avfbFk+BXj8xFafV/tj96tCVYvZcholkHM6w41zKvoQrqv17QINg/S7cOhJc5Z0PF+iA2AY8quWy+vDQF58Ni/znCofmHwY4YKNwDBrOPL0miocHL6eXUeqDCh3YtSq4taNj84p+a3nF/vwge6VmOz/otYofWHomyvlBvqOha3q5Q+5iyFiC3HYeB0g2Uq/q/CVjBYqmyQty8dxPenxxzKG65Nc/OXOAf2Zix/SldesolV3Z3aanYvobxGvW2AuemHndeay2D07venpZ6rVU84XBu7r2Gy3nQ72ye4K1xNpj3Fa+ABuKcbDnvimvFgOQTYt+f3sC0PrqVfo6csQ0bI15XTPsypZZYOkO3OgUO9sy0rpF6RO4dL8h2uLobrivSztADw9Nu/SrLtI43R08utEqDdRJ6ZeMcuY/W6PPHGeEMaGbdAoZEU7Vo7ysmaFVfSch94bT8VP9FfEcj+R3ac4VC901To6F3fQ03WqiyJV5/AlI6xo0xOnqx73SRLP6iTR49Qs=</diagram></mxfile>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/release-graph.xml.license",
"diff": "+SPDX-FileCopyrightText: 2021 Tocqueville Group\n+\n+SPDX-License-Identifier: LicenseRef-MIT-TQ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/release-workflow.md",
"diff": "+<!--\n+ - SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+ -\n+ - SPDX-License-Identifier: LicenseRef-MIT-TQ\n+ -->\n+# Release workflow\n+\n+This document explains the steps and timings of the release process in `tezos-packaging`.\n+\n+The releasing process is almost fully automated, with the initial release PR being created\n+at most 4 hours after a new Octez release. The only steps that require manual intervention\n+are reviews of this initial PR and of the PR that updates macOS brew formulae.\n+This allows `tezos-packaging` to closely follow Octez releases without large waiting times.\n+\n+This process can be described by the following diagram:\n+<!-- Use draw.io to edit this graph -->\n+<img src=\"./release-graph.svg\" width=\"100%\">\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/support-policy.md",
"new_path": "docs/support-policy.md",
"diff": "@@ -43,7 +43,7 @@ Brew formulae provided by `tezos-packaging` aim to support all maintained macOS\n* macOS 11 (Big Sur)\n* macOS 12 (Monterey)\n-Unfortunately, an ability to provide pre-compiled brew bottles for formulae has\n+Unfortunately, the ability to provide pre-compiled brew bottles for formulae has\na hard dependency on the available build infrastructure. At the moment, the only macOS\nversions for which we provide brew bottles are:\n* macOS 11 (Big Sur) both `x86_64` and `arm64`\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#307] Document release process
Problem: It's non-trivial for an external observer (or a newcomer
maintainer) to find out how the autoreleasing works in tezos-packaging.
Solution: Add a doc that contains a graph which describes the steps of
the release process and how they're triggered.
|
603,652
|
14.01.2022 12:50:29
| -10,800
|
ec7d5659dfeacaeb7f5abac7116887b5ced3a92b
|
Different variables for node and client dirs
Problem: We want to specify tezos-node and tezos-client data dir within
a single environment file. However, at the moment script use the same
variable for these directories.
Solution: Use 'NODE_DATA_DIR' in order to determine node data directory
in systemd services and scripts respectively.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -189,7 +189,7 @@ node_postrm_steps = \"\"\ncommon_node_env = [\"NODE_RPC_ADDR=127.0.0.1:8732\", \"CERT_PATH=\", \"KEY_PATH=\"]\nfor network in networks:\nenv = [\n- f\"DATA_DIR=/var/lib/tezos/node-{network}\",\n+ f\"NODE_DATA_DIR=/var/lib/tezos/node-{network}\",\nf\"NETWORK={network}\",\n] + common_node_env\nnode_units.append(\n@@ -214,7 +214,7 @@ rm -f /usr/bin/tezos-node-{network}\nnode_units.append(\nmk_node_unit(\nsuffix=\"custom\",\n- env=[\"DATA_DIR=/var/lib/tezos/node-custom\", \"CUSTOM_NODE_CONFIG=\"]\n+ env=[\"NODE_DATA_DIR=/var/lib/tezos/node-custom\", \"CUSTOM_NODE_CONFIG=\"]\n+ common_node_env,\ndesc=\"Tezos node with custom config\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-prestart",
"new_path": "docker/package/scripts/tezos-node-prestart",
"diff": "@@ -8,9 +8,15 @@ set -euo pipefail\nnode=\"/usr/bin/tezos-node\"\n-\"$node\" upgrade --data-dir \"$DATA_DIR\" storage\n-rm -rf \"$DATA_DIR/lmdb_store_to_remove\"\n+if [[ ! -d \"$NODE_DATA_DIR\" ]]; then\n+ mkdir -p \"$NODE_DATA_DIR\"\n+fi\n+\n+if [[ -d \"$NODE_DATA_DIR/store\" ]]; then\n+ \"$node\" upgrade --data-dir \"$NODE_DATA_DIR\" storage\n+ rm -rf \"$NODE_DATA_DIR/lmdb_store_to_remove\"\n+fi\n-if [[ ! -f \"$DATA_DIR/identity.json\" ]]; then\n- \"$node\" identity generate --data-dir \"$DATA_DIR\"\n+if [[ ! -f \"$NODE_DATA_DIR/identity.json\" ]]; then\n+ \"$node\" identity generate --data-dir \"$NODE_DATA_DIR\"\nfi\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-start",
"new_path": "docker/package/scripts/tezos-node-start",
"diff": "@@ -8,36 +8,37 @@ set -euo pipefail\nnode=\"/usr/bin/tezos-node\"\n# default location of the config file\n-config_file=\"$DATA_DIR/config.json\"\n+config_file=\"$NODE_DATA_DIR/config.json\"\n-mkdir -p \"$DATA_DIR\"\n+mkdir -p \"$NODE_DATA_DIR\"\n# CUSTOM_NODE_CONFIG can be provided in the tezos-node-custom.service environment\nif [[ -z \"${CUSTOM_NODE_CONFIG:-}\" ]]; then\nif [[ ! -f \"$config_file\" ]]; then\necho \"Configuring the node...\"\n\"$node\" config init \\\n- --data-dir \"$DATA_DIR\" \\\n+ --data-dir \"$NODE_DATA_DIR\" \\\n--rpc-addr \"$NODE_RPC_ADDR\" \\\n${NETWORK:+\"--network=$NETWORK\"} \\\n\"$@\"\nelse\necho \"Updating the node configuration...\"\n\"$node\" config update \\\n- --data-dir \"$DATA_DIR\" \\\n+ --data-dir \"$NODE_DATA_DIR\" \\\n--rpc-addr \"$NODE_RPC_ADDR\" \\\n${NETWORK:+\"--network=$NETWORK\"} \\\n\"$@\"\nfi\n+ node_run_args=(\"--data-dir\" \"$NODE_DATA_DIR\" \"--config-file\" \"$config_file\")\nelse\necho \"Run using custom node config file\"\nconfig_file=\"$CUSTOM_NODE_CONFIG\"\n+ node_run_args=(\"--data-dir\" \"$NODE_DATA_DIR\" \"--config-file\" \"$config_file\" --rpc-addr \"$NODE_RPC_ADDR\")\nfi\n# Launching the node\nif [[ -z \"$CERT_PATH\" || -z \"$KEY_PATH\" ]]; then\n- exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\"\n+ exec \"$node\" run \"${node_run_args[@]}\"\nelse\n- exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\" \\\n- --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\n+ exec \"$node\" run \"${node_run_args[@]}\" --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\nfi\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#349] Different variables for node and client dirs
Problem: We want to specify tezos-node and tezos-client data dir within
a single environment file. However, at the moment script use the same
variable for these directories.
Solution: Use 'NODE_DATA_DIR' in order to determine node data directory
in systemd services and scripts respectively.
|
603,652
|
28.01.2022 12:53:43
| -10,800
|
2626d0bd0d1560b9443b754d9037abe8b38fa03c
|
Support ExecStopPost scripts
Problem: It's convenient to have node directory cleanup as a
ExecStopPost stage of the systemd service. However, our existing code
doesn't support adding custom scripts to this attribute.
Solution: Allow using custom scripts in the ExecStopPost attribute.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/fedora.py",
"new_path": "docker/package/fedora.py",
"diff": "@@ -43,23 +43,16 @@ def build_fedora_package(\nf\"{cwd}/defaults/{systemd_unit.config_file}\",\nf\"{dir}/{unit_name}.default\",\n)\n- if systemd_unit.startup_script is not None:\n- dest_path = f\"{dir}/{systemd_unit.startup_script}\"\n- source_script_name = (\n- systemd_unit.startup_script\n- if systemd_unit.startup_script_source is None\n- else systemd_unit.startup_script_source\n- )\n+ for script, script_source in [\n+ (systemd_unit.startup_script, systemd_unit.startup_script_source),\n+ (systemd_unit.prestart_script, systemd_unit.prestart_script_source),\n+ (systemd_unit.poststop_script, systemd_unit.poststop_script_source),\n+ ]:\n+ if script is not None:\n+ dest_path = f\"{dir}/{script}\"\n+ source_script_name = script if script_source is None else script_source\nsource_path = f\"{cwd}/scripts/{source_script_name}\"\nshutil.copy(source_path, dest_path)\n- if systemd_unit.prestart_script is not None:\n- dest_path = f\"{dir}/{systemd_unit.prestart_script}\"\n- source_path = (\n- f\"{cwd}/scripts/{systemd_unit.prestart_script}\"\n- if systemd_unit.prestart_script_source is None\n- else f\"{cwd}/scripts/{systemd_unit.prestart_script_source}\"\n- )\n- shutil.copy(source_path, dest_path)\nsubprocess.run([\"tar\", \"-czf\", f\"{dir}.tar.gz\", dir], check=True)\nos.makedirs(f\"{home}/rpmbuild/SPECS\", exist_ok=True)\nos.makedirs(f\"{home}/rpmbuild/SOURCES\", exist_ok=True)\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -50,24 +50,17 @@ class AbstractPackage:\npass\ndef gen_install(self, out):\n- startup_scripts = list(\n- {\n- x.startup_script\n- for x in self.systemd_units\n- if x.startup_script is not None\n- }\n- )\n- prestart_scripts = list(\n- {\n- x.prestart_script\n- for x in self.systemd_units\n- if x.prestart_script is not None\n- }\n- )\n- if len(startup_scripts + prestart_scripts) > 0:\n- install_contents = \"\\n\".join(\n- [f\"debian/{x} usr/bin\" for x in startup_scripts + prestart_scripts]\n- )\n+ scripts = set()\n+ for unit in self.systemd_units:\n+ for script in [\n+ unit.startup_script,\n+ unit.prestart_script,\n+ unit.poststop_script,\n+ ]:\n+ if script is not None:\n+ scripts.add(script)\n+ if len(scripts) > 0:\n+ install_contents = \"\\n\".join([f\"debian/{x} usr/bin\" for x in scripts])\nwith open(out, \"w\") as f:\nf.write(install_contents)\n@@ -86,9 +79,11 @@ class AbstractPackage:\ndef gen_spec_systemd_part(package):\nsystemd_units = package.systemd_units\n- startup_scripts = list({x.startup_script for x in systemd_units}) + list(\n- {x.prestart_script for x in systemd_units}\n- )\n+ scripts = set()\n+ for unit in systemd_units:\n+ for script in [unit.startup_script, unit.prestart_script, unit.poststop_script]:\n+ if script is not None:\n+ scripts.add(script)\nconfig_files = [x.config_file for x in systemd_units if x.config_file is not None]\ninstall_unit_files = \"\"\nsystemd_unit_files = \"\"\n@@ -122,12 +117,12 @@ def gen_spec_systemd_part(package):\ndefault_files += f\"%{{_sysconfdir}}/default/{service_name}\\n\"\ninstall_startup_scripts = \"\"\nsystemd_startup_files = \"\"\n- for startup_script in startup_scripts:\n- if startup_script is not None:\n+ for script in scripts:\n+ if script is not None:\ninstall_startup_scripts += (\n- f\"install -m 0755 {startup_script} %{{buildroot}}/%{{_bindir}}\\n\"\n+ f\"install -m 0755 {script} %{{buildroot}}/%{{_bindir}}\\n\"\n)\n- systemd_startup_files += f\"%{{_bindir}}/{startup_script}\\n\"\n+ systemd_startup_files += f\"%{{_bindir}}/{script}\\n\"\nsystemd_deps = \"systemd systemd-rpm-macros\"\nsystemd_install = f\"\"\"\nmkdir -p %{{buildroot}}/%{{_unitdir}}\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/systemd.py",
"new_path": "docker/package/systemd.py",
"diff": "@@ -49,6 +49,8 @@ class SystemdUnit:\nstartup_script_source: str = None\nprestart_script: str = None\nprestart_script_source: str = None\n+ poststop_script: str = None\n+ poststop_script_source: str = None\nsuffix: str = None\nconfig_file: str = None\ninstances: List[str] = None\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/ubuntu.py",
"new_path": "docker/package/ubuntu.py",
"diff": "@@ -59,23 +59,18 @@ def build_ubuntu_package(\nf\"{cwd}/defaults/{systemd_unit.config_file}\",\nf\"debian/{default_name}.default\",\n)\n- if systemd_unit.startup_script is not None:\n- dest_path = f\"debian/{systemd_unit.startup_script}\"\n+ for script, script_source in [\n+ (systemd_unit.startup_script, systemd_unit.startup_script_source),\n+ (systemd_unit.prestart_script, systemd_unit.prestart_script_source),\n+ (systemd_unit.poststop_script, systemd_unit.poststop_script_source),\n+ ]:\n+ if script is not None:\n+ dest_path = f\"debian/{script}\"\nsource_script_name = (\n- systemd_unit.startup_script\n- if systemd_unit.startup_script_source is None\n- else systemd_unit.startup_script_source\n+ script if script_source is None else script_source\n)\nsource_path = f\"{cwd}/scripts/{source_script_name}\"\nshutil.copy(source_path, dest_path)\n- if systemd_unit.prestart_script is not None:\n- dest_path = f\"debian/{systemd_unit.prestart_script}\"\n- source_path = (\n- f\"{cwd}/scripts/{systemd_unit.prestart_script}\"\n- if systemd_unit.prestart_script_source is None\n- else f\"{cwd}/scripts/{systemd_unit.prestart_script_source}\"\n- )\n- shutil.copy(source_path, dest_path)\nwith open(\"debian/compat\", \"w\") as f:\nf.write(\"10\")\npkg.gen_install(\"debian/install\")\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#349] Support ExecStopPost scripts
Problem: It's convenient to have node directory cleanup as a
ExecStopPost stage of the systemd service. However, our existing code
doesn't support adding custom scripts to this attribute.
Solution: Allow using custom scripts in the ExecStopPost attribute.
|
603,652
|
28.01.2022 12:57:32
| -10,800
|
2e8aaf815c2abb44dbc34b57b7b350b9d66161bf
|
Use ExecStopPost to reset custom baking services
Problem: We need a convenient way to reset custom baking service.
Solution: Add additional 'RESET_ON_STOP' variable to the config file.
When this variable is set, custom baking service node directory is
removed when baking service is stopped.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/defaults/tezos-baking-custom.conf",
"new_path": "docker/package/defaults/tezos-baking-custom.conf",
"diff": "@@ -8,3 +8,4 @@ DATA_DIR=\"/var/lib/tezos/.tezos-client\"\nNODE_RPC_ENDPOINT=\"http://localhost:8732\"\nBAKER_ADDRESS_ALIAS=\"baker\"\nCUSTOM_NODE_CONFIG=\"\"\n+RESET_ON_STOP=\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -551,6 +551,10 @@ class TezosBakingServicesPackage(AbstractPackage):\n\"tezos-baking-custom.conf\",\n\"custom\",\n)\n+ custom_unit.service_file.service.exec_stop_post.append(\n+ \"/usr/bin/tezos-baking-custom-poststop %i\"\n+ )\n+ custom_unit.poststop_script = \"tezos-baking-custom-poststop\"\ncustom_unit.instances = []\nself.systemd_units.append(custom_unit)\nself.postinst_steps = \"\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/scripts/tezos-baking-custom-poststop",
"diff": "+#!/usr/bin/env bash\n+\n+# SPDX-FileCopyrightText: 2022 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+set -euo pipefail\n+\n+if [ -z \"$1\" ]; then\n+ echo \"Please call this script with the custom baking instance name.\"\n+ exit 1\n+fi\n+\n+instance_name=\"$1\"\n+\n+if [[ -n ${RESET_ON_STOP} ]]; then\n+ node_data_dir=\"$(systemctl show tezos-node-custom@\"$instance_name\".service | grep -o \"NODE_DATA_DIR=\\S*\" | cut -d'=' -f2)\"\n+ rm -rf \"$node_data_dir\"\n+fi\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#349] Use ExecStopPost to reset custom baking services
Problem: We need a convenient way to reset custom baking service.
Solution: Add additional 'RESET_ON_STOP' variable to the config file.
When this variable is set, custom baking service node directory is
removed when baking service is stopped.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.