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
|
03.08.2020 10:38:35
| -10,800
|
35724dda3ce95f899b31952450cd3b8ef2d08cd5
|
Mention systemd stuff in README
Problem: Now we have systemd units, we should tell the users how to use
them.
Solution: Update root README in order to mention that ubuntu packages
now have systemd unit included and explain how to configure and use
them.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -36,6 +36,32 @@ sudo apt-get install tezos-baker-006-pscartha\n```\nOnce you install such packages the commands `tezos-*` will be available.\n+### Systemd units for `tezos-node` and daemons\n+\n+`tezos-node`, `tezos-accuser-006-pscartha`, `tezos-baker-006-pscartha` and\n+`tezos-endorser-006-pscartha` packages have systemd files included to the\n+package.\n+\n+Once you've installed the packages with systemd unit, you can run the service\n+with the binary from the package using the following command:\n+```\n+systemctl start <package-name>.service\n+```\n+To stop the service run:\n+```\n+systemctl stop <package-name>.service\n+```\n+\n+Each service has configuration file located in `/etc/default`. Default\n+configurations can be found [here](docker/package/defaults/).\n+\n+Files created by the services will be located in `/var/lib/tezos/` by default.\n+`tezos-{accuser, baker, endorser}-006-pscartha` services can have configurable\n+data directory.\n+\n+`tezos-{accuser, endorser}` have configurable node address, so that they can be used with both\n+remote and local node.\n+\n## Fedora Copr repository with `tezos-*` binaries\nIf you are using Fedora you can use Copr in order to install `tezos-*`\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Mention systemd stuff in README
Problem: Now we have systemd units, we should tell the users how to use
them.
Solution: Update root README in order to mention that ubuntu packages
now have systemd unit included and explain how to configure and use
them.
|
603,652
|
03.08.2020 11:08:16
| -10,800
|
5a3efb101d590caee85d50a2e3c159556860b627
|
Don't hardcode container name for package building
Problem: It's impossible to have two containers with the same names
in docker, this can potentially make CI stuck.
Solution: Don't hardcode container name and prefetch its id using
`docker create` instead.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/docker-ubuntu-packages.sh",
"new_path": "docker/docker-ubuntu-packages.sh",
"diff": "@@ -11,7 +11,8 @@ set -euo pipefail\ndocker build -t tezos-ubuntu -f docker/package/Dockerfile .\nset +e\n-docker run -t --name package_builder tezos-ubuntu \"$@\"\n-docker cp package_builder:/tezos-packaging/docker/out .\n+container_id=\"$(docker create -t tezos-ubuntu \"$@\")\"\n+docker start -a \"$container_id\"\n+docker cp \"$container_id\":/tezos-packaging/docker/out .\nset -e\n-docker rm -v package_builder\n+docker rm -v \"$container_id\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Don't hardcode container name for package building
Problem: It's impossible to have two containers with the same names
in docker, this can potentially make CI stuck.
Solution: Don't hardcode container name and prefetch its id using
`docker create` instead.
|
603,652
|
03.08.2020 15:19:50
| -10,800
|
f59d6a9ad9f6fe56fb80e231d0924de65f734077
|
Update 'dep5' for nix-related files
|
[
{
"change_type": "MODIFY",
"old_path": ".reuse/dep5",
"new_path": ".reuse/dep5",
"diff": "Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\n-Files: .github/* nix/* protocols.json meta.json\n+Files: .github/* nix/nix/* protocols.json meta.json\nCopyright: TQ Tezos <https://tqtezos.com>\nLicense: MPL-2.0\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update 'dep5' for nix-related files
|
603,652
|
05.08.2020 16:30:31
| -10,800
|
bbd9f3459885bb1c751e8ef9760c1d1bf1f49fa6
|
Don't build deb packages in master
Problem: It doesn't make much sense to build debian packages in the
master branch, moreover, building binary packages takes substantial
amount of time.
Solution: Don't build debian packages in master branch.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -48,12 +48,14 @@ steps:\n- nix run -f. pkgs.docker -c ./docker/docker-ubuntu-packages.sh source\nartifact_paths:\n- ./out/*\n+ branches: \"!master\"\n- label: test deb binary packages via docker\ncommands:\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- nix run -f. pkgs.docker -c ./docker/docker-ubuntu-packages.sh binary tezos-baker-006-PsCARTHA\n- rm -rf out\n+ branches: \"!master\"\n- label: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Don't build deb packages in master
Problem: It doesn't make much sense to build debian packages in the
master branch, moreover, building binary packages takes substantial
amount of time.
Solution: Don't build debian packages in master branch.
|
603,652
|
13.08.2020 10:10:02
| -10,800
|
eea8c5486905b674953334eb9b42a6caa358e875
|
Update CONTRIBUTING.md
Problem: Our contributing doc has outdated instructions for updating
tezos via 'niv.'
Solution: Update these instructions.
|
[
{
"change_type": "MODIFY",
"old_path": ".github/CONTRIBUTING.md",
"new_path": ".github/CONTRIBUTING.md",
"diff": "@@ -19,8 +19,10 @@ otherwise improve our project, pull requests are most welcome.\n- Tezos revision is located in the [`sources.json`](../nix/nix/sources.json) file.\nYou can either update it manually to newer revision or use `niv` tool.\n- In order to do that run `niv update tezos` (this will update revision to latest).\n- `niv update tezos -a rev=...` will update wources to some commit.\n+ In order to do that run\n+ `niv update tezos -a ref=<tag from tezos repo> -a rev=<commit in this tag>`\n+ from the [`nix/`](../nix) directory. This command will update sources to some commit\n+ from the given tag.\n- Used tezos protocols can be changed by [`proto`](../script/proto) script.\nThis script requires `jq` and `moreutils` to be installed.\nCurrently used protocols are displayed in [`protocols.json`](../protocols.json).\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#66] Update CONTRIBUTING.md
Problem: Our contributing doc has outdated instructions for updating
tezos via 'niv.'
Solution: Update these instructions.
|
603,652
|
14.08.2020 13:36:43
| -10,800
|
4d9817294a950dd9de487c2350df163b9f831264
|
Fetch tezos version from env for docker
Problem: Currently tezos sources version is hardcoded in
`docker/build/Dockerfile` for static binaries. Package building
uses version from nix/nix/sources.json. It's not really convenient.
Solution: Fetch tezos version from `TEZOS_VERSION` env variable that
needs to be set before building binaries or packages via docker.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "env:\nNIX_PATH: nixpkgs=https://github.com/serokell/nixpkgs/archive/master.tar.gz\n+ SET_VERSION: \"export TEZOS_VERSION=\\\"$(cat nix/nix/sources.json | jq -r '.tezos.ref')\\\"\"\nsteps:\n- label: reuse lint\n@@ -31,6 +32,7 @@ steps:\n- label: build via docker\ncommands:\n+ - eval \"$SET_VERSION\"\n- cd docker\n- nix run -f.. pkgs.docker -c ./docker-static-build.sh\n- nix run -f.. pkgs.upx -c upx tezos-*\n@@ -45,12 +47,14 @@ steps:\n- label: test deb source packages via docker\ncommands:\n+ - eval \"$SET_VERSION\"\n- nix run -f. pkgs.docker -c ./docker/docker-ubuntu-packages.sh source\nartifact_paths:\n- ./out/*\nbranches: \"!master\"\n- label: test deb binary packages via docker\ncommands:\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- nix run -f. pkgs.docker -c ./docker/docker-ubuntu-packages.sh binary tezos-baker-006-PsCARTHA\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/README.md",
"new_path": "docker/README.md",
"diff": "Static binaries building using custom alpine image.\n[`docker-static-build.sh`](docker-static-build.sh) will build tezos binaries\n-image defined in [Dockerfile](build/Dockerfile). In order to build them, just run the script\n+image defined in [Dockerfile](build/Dockerfile). In order to build them you should specify\n+`TEZOS_VERSION` env variable and run the script:\n```\n+export TEZOS_VERSION=\"v7.3\"\n./docker-static-build.sh\n```\nAfter that, directory will contain built static binaries.\n@@ -30,8 +32,10 @@ version defined in [sources.json](../nix/nix/sources.json) and build native ubun\n### `.deb` packages\n-In order to build binary `.deb` packages run the following command:\n+In order to build binary `.deb` packages specify `TEZOS_VERSION` and\n+run the following command:\n```\n+export TEZOS_VERSION=\"v7.3\"\ncd .. && ./docker/docker-ubuntu-packages.sh binary\n```\n@@ -39,6 +43,7 @@ It is also possible to build single package. In order to do that run the followi\n```\n# cd .. && ./docker/docker-ubuntu-packages.sh binary <tezos-binary-name>\n# Example for baker\n+export TEZOS_VERSION=\"v7.3\"\ncd .. && ./docker/docker-ubuntu-packages.sh binary tezos-baker-006-PsCARTHA\n```\n@@ -54,8 +59,9 @@ sudo apt install <path to deb file>\n### Source packages and publishing them on Launchpad PPA\n-In order to build source packages run the following command:\n+In order to build source packages run the following commands:\n```\n+export TEZOS_VERSION=\"v7.3\"\ncd .. && ./docker/docker-ubuntu-packages.sh source\n# you can also build single source package\ncd .. && ./docker/docker-ubuntu-packages.sh source tezos-baker-006-PsCARTHA\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/build/Dockerfile",
"new_path": "docker/build/Dockerfile",
"diff": "@@ -13,7 +13,8 @@ RUN git clone --single-branch --branch hidapi-0.9.0 https://github.com/libusb/hi\nRUN cd hidapi && autoreconf -fvi && ./bootstrap && ./configure && make && make install\nRUN rm -rf libusb hidapi\nCOPY ./build/static_libs.patch /static.patch\n-RUN git clone --single-branch --branch v7.3 https://gitlab.com/tezos/tezos.git --depth 1\n+ARG TEZOS_VERSION\n+RUN git clone --single-branch --branch ${TEZOS_VERSION} https://gitlab.com/tezos/tezos.git --depth 1\nWORKDIR /tezos\nRUN git apply ../static.patch\nRUN export OPAMYES=\"true\" && opam init --bare --disable-sandboxing && make build-deps\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/docker-static-build.sh",
"new_path": "docker/docker-static-build.sh",
"diff": "@@ -13,7 +13,8 @@ binaries=(\"tezos-accuser-006-PsCARTHA\" \"tezos-admin-client\" \"tezos-baker-006-PsC\n\"tezos-client\" \"tezos-endorser-006-PsCARTHA\" \"tezos-node\" \"tezos-signer\"\n)\n-docker build -t alpine-tezos -f build/Dockerfile .\n+echo $TEZOS_VERSION\n+docker build -t alpine-tezos -f build/Dockerfile --build-arg TEZOS_VERSION=\"$TEZOS_VERSION\" .\ncontainer_id=\"$(docker create alpine-tezos)\"\nfor b in \"${binaries[@]}\"; do\ndocker cp \"$container_id:/tezos/$b\" \"$b\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/docker-ubuntu-packages.sh",
"new_path": "docker/docker-ubuntu-packages.sh",
"diff": "@@ -11,7 +11,7 @@ set -euo pipefail\ndocker build -t tezos-ubuntu -f docker/package/Dockerfile .\nset +e\n-container_id=\"$(docker create -t tezos-ubuntu \"$@\")\"\n+container_id=\"$(docker create --env TEZOS_VERSION=\"$TEZOS_VERSION\" -t tezos-ubuntu \"$@\")\"\ndocker start -a \"$container_id\"\ndocker cp \"$container_id\":/tezos-packaging/docker/out .\nset -e\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile",
"new_path": "docker/package/Dockerfile",
"diff": "@@ -10,7 +10,6 @@ ENV USER dockerbuilder\nRUN useradd dockerbuilder && mkdir /tezos-packaging\nENV HOME /tezos-packaging\nCOPY meta.json /tezos-packaging/meta.json\n-COPY nix/nix/sources.json /tezos-packaging/nix/nix/sources.json\nCOPY protocols.json /tezos-packaging/protocols.json\nWORKDIR /tezos-packaging/docker\nENV OPAMROOT \"/tezos-packaging/docker/opamroot\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -31,14 +31,13 @@ if len(sys.argv) == 3:\ndate = subprocess.check_output([\"date\", \"-R\"]).decode().strip()\nmeta = json.load(open(\"../meta.json\", \"r\"))\n-tezos_sources = json.load(open(\"../nix/nix/sources.json\", \"r\"))[\"tezos\"]\ncommon_deps = [\"libev-dev\", \"libgmp-dev\", \"libhidapi-dev\", \"m4\", \"perl\", \"pkg-config\",\n\"wget\", \"unzip\", \"rsync\"]\nactive_protocols = json.load(open(\"../protocols.json\", \"r\"))[\"active\"]\n-version = f\"{tezos_sources['ref'][1:]}\"\n+version = os.environ[\"TEZOS_VERSION\"][1:]\nrelease = f\"{meta['release']}\"\npackage_version = f\"{meta['epoch']}:0ubuntu{version}-{release}\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#66] Fetch tezos version from env for docker
Problem: Currently tezos sources version is hardcoded in
`docker/build/Dockerfile` for static binaries. Package building
uses version from nix/nix/sources.json. It's not really convenient.
Solution: Fetch tezos version from `TEZOS_VERSION` env variable that
needs to be set before building binaries or packages via docker.
|
603,652
|
26.08.2020 13:23:56
| -10,800
|
aacc5cab9fbe3114373ec50957d331c62c54458b
|
Allow all old protocols in protocols.json
Problem: We doesn't compile all protocols for nix binaries, this lead to
a problem when bootstrapping mainnet node, it says that old protocols
are missing during block validation.
Solution: Allow all old protocols.
|
[
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "{\n\"ignored\": [\n\"alpha\",\n- \"demo-counter\",\n+ \"demo-counter\"\n+ ],\n+ \"allowed\": [\n+ \"genesis\",\n+ \"genesis-carthagenet\",\n+ \"000-Ps9mPmXa\",\n\"001-PtCJ7pwo\",\n\"002-PsYLVpVv\",\n\"003-PsddFKi3\",\n\"005-PsBABY5H\",\n\"005-PsBabyM1\"\n],\n- \"allowed\": [\n- \"genesis\",\n- \"genesis-carthagenet\",\n- \"000-Ps9mPmXa\"\n- ],\n\"active\": [\n\"006-PsCARTHA\"\n]\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Allow all old protocols in protocols.json
Problem: We doesn't compile all protocols for nix binaries, this lead to
a problem when bootstrapping mainnet node, it says that old protocols
are missing during block validation.
Solution: Allow all old protocols.
|
603,652
|
26.08.2020 14:57:05
| -10,800
|
6bb6b4d60ef0fce3e5c9cf34bc4dc4d7a17705b8
|
Don't use `NIX_PATH`
Problem: We have `NIX_PATH` in the pipeline setting which is used in
tests and points to the nixpkgs master, which is bad because using
non-pinned nixpkgs can cause unexpected massive rebuilds.
Solution: Use nixpkgs from sources in the tests.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "# SPDX-License-Identifier: MPL-2.0\nenv:\n- NIX_PATH: nixpkgs=https://github.com/serokell/nixpkgs/archive/master.tar.gz\nSET_VERSION: \"export TEZOS_VERSION=\\\"$(cat nix/nix/sources.json | jq -r '.tezos.ref')\\\"\"\nsteps:\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-binaries.nix",
"new_path": "tests/tezos-binaries.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n{ path-to-binaries ? null } @ args:\n-import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, ... }:\n+let\n+ nixpkgs = (import ../nix/nix/sources.nix).nixpkgs;\n+in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ pkgs, ... }:\n{\nnodes.machine = { ... }: { virtualisation.memorySize = 1024; };\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Don't use `NIX_PATH`
Problem: We have `NIX_PATH` in the pipeline setting which is used in
tests and points to the nixpkgs master, which is bad because using
non-pinned nixpkgs can cause unexpected massive rebuilds.
Solution: Use nixpkgs from sources in the tests.
|
603,652
|
27.08.2020 10:42:54
| -10,800
|
5eca09a365fb0fa6c6fe9308d8d3b755cc9523a3
|
Use custom shell.nix for autorelease.sh
Problem: `nix-shell -p` requires nixpkgs to be in
`NIX_PATH`, which we removed earlier.
Solution: Use shell.nix file instead of using `-p` option.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "#!/usr/bin/env nix-shell\n-#!nix-shell -p gitAndTools.hub git rename -i bash\n+#!nix-shell shell.nix -i bash\n# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/shell.nix",
"diff": "+# SPDX-FileCopyrightText: 2019-2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs {} }:\n+with pkgs;\n+mkShell {\n+ buildInputs = [ gitAndTools.hub git rename ];\n+}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Use custom shell.nix for autorelease.sh
Problem: `nix-shell -p` requires nixpkgs to be in
`NIX_PATH`, which we removed earlier.
Solution: Use shell.nix file instead of using `-p` option.
|
603,652
|
07.09.2020 10:32:54
| -10,800
|
9290e7f93815271291bb2b8da45b3afdeb538b7b
|
Bump tezos to v7.4
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\ndiff --git a/src/bin_client/dune b/src/bin_client/dune\n-index cd22cd7..dc732e2 100644\n+index 28822fb9f..27c6b81ca 100644\n--- a/src/bin_client/dune\n+++ b/src/bin_client/dune\n-@@ -68,7 +68,10 @@\n+@@ -74,7 +74,10 @@\n-open Tezos_client_commands\n-open Tezos_mockup_commands\n-open Tezos_client_base_unix\n@@ -18,10 +18,10 @@ index cd22cd7..dc732e2 100644\n(rule\n(target void_for_linking)\ndiff --git a/src/bin_node/dune b/src/bin_node/dune\n-index 568dcab..14cf4e0 100644\n+index 7ff6a869a..6ee10ed34 100644\n--- a/src/bin_node/dune\n+++ b/src/bin_node/dune\n-@@ -79,7 +79,9 @@\n+@@ -85,7 +85,9 @@\n-open Tezos_shell_context\n-open Tezos_workers\n-open Tezos_protocol_updater\n@@ -32,8 +32,37 @@ index 568dcab..14cf4e0 100644\n(rule\n(target void_for_linking)\n+diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n+index a79e48830..2bafdc807 100644\n+--- a/src/bin_signer/dune\n++++ b/src/bin_signer/dune\n+@@ -20,7 +20,10 @@\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++ )))\n+\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n+index 21b4bec58..9af9818fd 100644\n+--- a/src/lib_protocol_compiler/dune\n++++ b/src/lib_protocol_compiler/dune\n+@@ -65,7 +65,7 @@\n+ (public_name tezos-protocol-compiler)\n+ (modes native)\n+ (libraries tezos_protocol_compiler_native)\n+- (flags (:standard -linkall))\n++ (flags (:standard -linkall -ccopt -static))\n+ (modules Main_native))\n+\n+ (executable\ndiff --git a/src/proto_006_PsCARTHA/bin_accuser/dune b/src/proto_006_PsCARTHA/bin_accuser/dune\n-index e99ac8f..5afd74b 100644\n+index e99ac8f95..401f9f2fe 100644\n--- a/src/proto_006_PsCARTHA/bin_accuser/dune\n+++ b/src/proto_006_PsCARTHA/bin_accuser/dune\n@@ -49,7 +78,7 @@ index e99ac8f..5afd74b 100644\n(alias\n(name runtest_lint)\ndiff --git a/src/proto_006_PsCARTHA/bin_baker/dune b/src/proto_006_PsCARTHA/bin_baker/dune\n-index d96ef4c..baa8598 100644\n+index d96ef4cde..855f24ac5 100644\n--- a/src/proto_006_PsCARTHA/bin_baker/dune\n+++ b/src/proto_006_PsCARTHA/bin_baker/dune\n@@ -65,7 +94,7 @@ index d96ef4c..baa8598 100644\n(alias\n(name runtest_lint)\ndiff --git a/src/proto_006_PsCARTHA/bin_endorser/dune b/src/proto_006_PsCARTHA/bin_endorser/dune\n-index c675ab3..ac0f52b 100644\n+index c675ab3c5..ac0f52b7a 100644\n--- a/src/proto_006_PsCARTHA/bin_endorser/dune\n+++ b/src/proto_006_PsCARTHA/bin_endorser/dune\n@@ -79,37 +108,55 @@ index c675ab3..ac0f52b 100644\n(alias\n(name runtest_lint)\n-diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n-index e4c9a7c..2a5f941 100644\n---- a/src/bin_signer/dune\n-+++ b/src/bin_signer/dune\n-@@ -19,7 +19,10 @@\n- -open Tezos_rpc_http_server\n- -open Tezos_rpc_http_client_unix\n+diff --git a/src/proto_007_PsDELPH1/bin_accuser/dune b/src/proto_007_PsDELPH1/bin_accuser/dune\n+index da3093f82..0e60e123a 100644\n+--- a/src/proto_007_PsDELPH1/bin_accuser/dune\n++++ b/src/proto_007_PsDELPH1/bin_accuser/dune\n+@@ -10,7 +10,10 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_007_PsDELPH1_commands\n-open Tezos_stdlib_unix\n-- -open Tezos_stdlib)))\n-+ -open Tezos_stdlib\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n+ )))\n(alias\n(name runtest_lint)\n-diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n-index 0902181..30fe55b 100644\n---- a/src/lib_protocol_compiler/dune\n-+++ b/src/lib_protocol_compiler/dune\n-@@ -65,7 +65,7 @@\n- (public_name tezos-protocol-compiler)\n- (modes native)\n- (libraries tezos_protocol_compiler_native)\n-- (flags (:standard -linkall))\n-+ (flags (:standard -linkall -ccopt -static))\n- (modules Main_native))\n+diff --git a/src/proto_007_PsDELPH1/bin_baker/dune b/src/proto_007_PsDELPH1/bin_baker/dune\n+index 490b09f8c..1e9d89a87 100644\n+--- a/src/proto_007_PsDELPH1/bin_baker/dune\n++++ b/src/proto_007_PsDELPH1/bin_baker/dune\n+@@ -10,7 +10,10 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_007_PsDELPH1_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++ )))\n- (executable\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/proto_007_PsDELPH1/bin_endorser/dune b/src/proto_007_PsDELPH1/bin_endorser/dune\n+index 074b4e006..cf801b59c 100644\n+--- a/src/proto_007_PsDELPH1/bin_endorser/dune\n++++ b/src/proto_007_PsDELPH1/bin_endorser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_007_PsDELPH1_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+\n+ (alias\n+ (name runtest_lint)\ndiff --git a/vendors/index/src/unix/dune b/vendors/index/src/unix/dune\n-index 49e819d..833a3f4 100644\n+index 49e819dd2..833a3f473 100644\n--- a/vendors/index/src/unix/dune\n+++ b/vendors/index/src/unix/dune\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/docker-static-build.sh",
"new_path": "docker/docker-static-build.sh",
"diff": "set -euo pipefail\n-binaries=(\"tezos-accuser-006-PsCARTHA\" \"tezos-admin-client\" \"tezos-baker-006-PsCARTHA\"\n- \"tezos-client\" \"tezos-endorser-006-PsCARTHA\" \"tezos-node\" \"tezos-signer\"\n- )\n+binaries=(\"tezos-admin-client\" \"tezos-client\" \"tezos-node\" \"tezos-signer\")\n+\n+for proto in $(jq -r \".active | .[]\" ../protocols.json); do\n+ binaries+=(\"tezos-accuser-$proto\" \"tezos-baker-$proto\" \"tezos-endorser-$proto\")\n+done\narch=\"host\"\n"
},
{
"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\": \"v7.3\",\n+ \"ref\": \"v7.4\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"ba45727cadd0416936fbd49400bcc986a55064ca\",\n+ \"rev\": \"e69b63f128701b2cdad665e8037a330305f591ce\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Bump tezos to v7.4
|
603,652
|
01.09.2020 11:44:18
| -10,800
|
acad6cfac98681ed40b392a320bc9bde1658801d
|
Build arm binaries in CI
Problem: We want to have automated way for building static arm binaries.
Solution: Use dedicated buildkite-agent which is run on arm64 machine
for building statis arm binaries.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -37,6 +37,21 @@ steps:\n- nix run -f.. pkgs.upx -c upx tezos-*\nartifact_paths:\n- ./docker/tezos-*\n+ # arm builer is an ubuntu machine without nix\n+ - label: build arm via docker\n+ commands:\n+ - eval \"$SET_VERSION\"\n+ - cd docker\n+ - ./docker-static-build.sh\n+ - upx tezos-*\n+ - >\n+ for f in ./tezos-*; do\n+ mv \"\\$f\" \"\\$f-arm64\"\n+ done\n+ artifact_paths:\n+ - ./docker/tezos-*\n+ agents:\n+ queue: \"arm64-build\"\n- label: test docker-built binaries\ncommands:\n- buildkite-agent artifact download \"docker/*\" . --step \"build via docker\"\n@@ -60,11 +75,13 @@ steps:\n- rm -rf out\nbranches: \"!master\"\n-\n+ - wait\n- label: create auto pre-release\ncommands:\n- mkdir binaries\n+ - mkdir arm-binaries\n- buildkite-agent artifact download \"docker/*\" binaries --step \"build via docker\"\n+ - buildkite-agent artifact download \"docker/*\" arm-binaries --step \"build arm via docker\"\n- ls binaries\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\nbranches: master\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ docker-binaries ? null }:\n+{ docker-binaries ? null, docker-arm-binaries ? null }:\nlet\npkgs = import ./nix/build/pkgs.nix { };\nsource = (import ./nix/nix/sources.nix).tezos;\n@@ -14,7 +14,7 @@ let\nbranchName = source.ref;\nlicenseFile = \"${source}/LICENSE\";\n} // meta;\n- release =\n- pkgs.callPackage ./release.nix { binaries = docker-binaries; inherit commonMeta; };\n+ release = pkgs.callPackage ./release.nix\n+ { binaries = docker-binaries; arm-binaries = docker-arm-binaries; inherit commonMeta; };\nin { inherit release commonMeta pkgs; }\n"
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ writeTextDir, runCommand, buildEnv, binaries, commonMeta }:\n+{ writeTextDir, runCommand, buildEnv, binaries, arm-binaries, commonMeta }:\nlet\nrelease-binaries = import ./nix/build/release-binaries.nix;\nrelease-notes = writeTextDir \"release-notes.md\" ''\n@@ -10,6 +10,9 @@ let\nThis release contains assets based on [${commonMeta.branchName} release](https://gitlab.com/tezos/tezos/tree/${commonMeta.branchName}).\n+ Binaries that target arm64 architecture has `-arm64` suffix in the name.\n+ Other binaries target x86_64.\n+\nDescriptions for binaries included in this release:\n${builtins.concatStringsSep \"\\n\"\n(map ({ name, description, ... }: \"- `${name}`: ${description}\")\n@@ -17,13 +20,16 @@ let\n'';\nreleaseNoTarball = buildEnv {\nname = \"tezos-release-no-tarball\";\n- paths = [ \"${binaries}\" LICENSE release-notes ];\n+ paths = [ \"${binaries}\" \"${arm-binaries}\" LICENSE release-notes ];\n};\ntarballName = \"binaries-${commonMeta.version}-${commonMeta.release}.tar.gz\";\n+ armTarballName = \"binaries-${commonMeta.version}-${commonMeta.release}-arm64.tar.gz\";\nbinariesTarball = runCommand \"binaries-tarball\" { }\n\"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/${tarballName} -C ${binaries} .\";\n+ armBinariesTarball = runCommand \"binaries-tarball\" { }\n+ \"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/${armTarballName} -C ${arm-binaries} .\";\nLICENSE = writeTextDir \"LICENSE\" (builtins.readFile commonMeta.licenseFile);\nin buildEnv {\nname = \"tezos-release\";\n- paths = [ releaseNoTarball binariesTarball ];\n+ paths = [ releaseNoTarball binariesTarball armBinariesTarball ];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -19,7 +19,8 @@ trap finish EXIT\nassets_dir=$TEMPDIR/assets\n# Build release.nix\n-nix-build -A release -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" --arg docker-binaries ./binaries/docker\n+nix-build -A release -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" \\\n+ --arg docker-binaries ./binaries/docker --arg docker-arm-binaries ./arm-binaries/docker\nmkdir -p \"$assets_dir\"\n# Move archive with binaries and tezos license to assets\nshopt -s extglob\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#64] Build arm binaries in CI
Problem: We want to have automated way for building static arm binaries.
Solution: Use dedicated buildkite-agent which is run on arm64 machine
for building statis arm binaries.
|
603,652
|
23.09.2020 14:40:51
| -10,800
|
1d58bab793e2cbd2da1ebf4b88dc05f29f75bc4c
|
Hotfix autoreleasing
Problem: Step name was changed, but autoreleasing step wasn't updated
accordingly.
Solution: Update autorelease step.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -82,7 +82,7 @@ steps:\ncommands:\n- mkdir binaries\n- mkdir arm-binaries\n- - buildkite-agent artifact download \"docker/*\" binaries --step \"build via docker\"\n+ - buildkite-agent artifact download \"docker/*\" binaries --step \"build via podman\"\n- buildkite-agent artifact download \"docker/*\" arm-binaries --step \"build arm via docker\"\n- ls binaries\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Hotfix autoreleasing
Problem: Step name was changed, but autoreleasing step wasn't updated
accordingly.
Solution: Update autorelease step.
|
603,652
|
16.09.2020 13:50:44
| -10,800
|
421eecbeb58df6106da8b6374d96ca6363259186
|
Mention `.service` file generation
Problem: One may want to have systemd service with tezos-binary on
another OS (not ubuntu).
Solution: Mention how to generate `.service` file in the README and
mention the place where startup scripts and default config files are
located.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -92,6 +92,24 @@ chmod +x tezos-client\nRun `./tezos-client` or add it to your PATH to be able to run it anywhere.\n+### Systemd units for `tezos-node` and daemons\n+\n+You can set up `tezos-node` and `baker/endorser/accuser` daemons as a systemd unit.\n+For this you'll need `.service` file to define systemd service. The easiest way\n+to get one is to run [`gen_systemd_service_file.py`](gen_systemd_service_file.py).\n+You should specify service name as a first argument and optionally provide target protocol\n+as a second argument, e.g.:\n+```\n+./gen_systemd_service_file.py tezos-node\n+# or\n+./gen_systemd_service_file.py tezos-baker 006-PsCARTHA\n+```\n+After that you'll have `.service` file in the current directory.\n+\n+Apart, from `.service` file you'll need service startup script and default configuration\n+file, they can be found in [`scripts`](./docker/package/scripts) and\n+[`defaults`](./docker/package/defaults) folders respectively.\n+\n## Build Instructions\nThis repository provides two distinct ways for building and packaging tezos binaries:\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "gen_systemd_service_file.py",
"diff": "+#! /usr/bin/env python3\n+\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+import package.systemd_files_generator as gen\n+import sys\n+\n+if len(sys.argv) > 1:\n+ service_name = sys.argv[1]\n+ if len(sys.argv) == 3:\n+ service_file = gen.gen_service(service_name, sys.argv[2])\n+ else:\n+ service_file = gen.gen_service(service_name)\n+ gen.print_service_file(service_file, f\"{service_name}.service\")\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#77] Mention `.service` file generation
Problem: One may want to have systemd service with tezos-binary on
another OS (not ubuntu).
Solution: Mention how to generate `.service` file in the README and
mention the place where startup scripts and default config files are
located.
|
603,652
|
23.09.2020 15:11:55
| -10,800
|
25851b22a2f12c19d942d084a2126bcfc26646f8
|
Add fedora package building to CI
Problem: We want to be sure that our packaging procedure is sane.
Solution: Build fedora source packages and one binary fedora package in
CI.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -64,7 +64,7 @@ steps:\n- label: test deb source packages via podman\ncommands:\n- eval \"$SET_VERSION\"\n- - ./docker/docker-ubuntu-packages.sh source\n+ - ./docker/docker-tezos-packages.sh ubuntu source\nartifact_paths:\n- ./out/*\nbranches: \"!master\"\n@@ -73,7 +73,22 @@ steps:\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-ubuntu-packages.sh binary tezos-baker-006-PsCARTHA\n+ - ./docker/docker-tezos-packages.sh ubuntu binary tezos-baker-006-PsCARTHA\n+ - rm -rf out\n+ branches: \"!master\"\n+ - label: test rpm source packages via podman\n+ commands:\n+ - eval \"$SET_VERSION\"\n+ - ./docker/docker-tezos-packages.sh fedora source\n+ artifact_paths:\n+ - ./out/*\n+ branches: \"!master\"\n+ - label: test rpm binary packages via podman\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 fedora binary tezos-baker-007-PsDELPH1\n- rm -rf out\nbranches: \"!master\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#62] Add fedora package building to CI
Problem: We want to be sure that our packaging procedure is sane.
Solution: Build fedora source packages and one binary fedora package in
CI.
|
603,652
|
23.09.2020 15:44:40
| -10,800
|
6ed74b7e6a2d99e30ee9f3962ac65fdec78e155f
|
Prune nix-based fedora packaging
Problem: Now we have nix-less way for creating fedora packages.
Nix-based way is redundant now.
Solution: Remove nix-based way for fedora packaging.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -15,17 +15,15 @@ steps:\ncommand: \"nix run -f https://github.com/serokell/crossref-verifier/archive/68a1f9d25b6e7835fea8299b18a3e6c61dbb2a5c.tar.gz -c crossref-verify\"\nsoft_fail: true\n- - label: build and package via nix\n+ - label: build via nix\ncommands:\n- nix-build ./nix -A binaries -o binaries\n- - nix-build ./nix -A rpm -o rpm-packages\nartifact_paths:\n- ./binaries/bin/*\n- - ./rpm-packages/*\nbranches: \"!master\"\n- label: test nix-built binaries\ncommands:\n- - buildkite-agent artifact download \"binaries/bin/*\" . --step \"build and package via nix\"\n+ - buildkite-agent artifact download \"binaries/bin/*\" . --step \"build via nix\"\n- chmod +x ./binaries/bin/*\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./binaries/bin\nbranches: \"!master\"\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/README.md",
"new_path": "nix/README.md",
"diff": "@@ -19,36 +19,3 @@ nix build -f. binaries.tezos-client\n```\nThis will produce `tezos-client` binary.\n-\n-### Fedora `.rpm` packages\n-\n-Run one of the following commands:\n-```\n-nix-build -A rpm -o rpm-packages --arg timestamp $(date +\"%Y%m%d%H%M\")\n-```\n-\n-Or use Makefile:\n-```bash\n-make rpm-packages #build rpm packages\n-```\n-\n-To build `.rpm` packages with tezos binaries.\n-\n-Once you built them, you can install `.rpm` packages using the following command:\n-```\n-sudo yum localinstall <path to the rpm file>\n-```\n-\n-### Publish packages on Fedora Copr\n-\n-In order to publish packages on Copr you will have to build source packages,\n-you can do this by running the following command:\n-```\n-nix-build -A rpmSource -o rpm-source-packages \\\n---arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\"\n-# Copy files from /nix/store\n-mkdir -p source-packages\n-cp rpm-source-packages/* source-packages\n-```\n-After this `source-packages` directory will contain `.src.rpm` packages which\n-can be uploaded to Copr repository.\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -14,16 +14,6 @@ let\nvalue = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; };\n}) release-binaries);\n- inherit (import ../. {}) commonMeta;\n- rpmMeta = { arch = \"x86_64\"; };\n- rpm = builtins.mapAttrs\n- (_: pkgs.callPackage ./package/rpm.nix { meta = commonMeta // rpmMeta; }) binaries;\n- rpmSource = builtins.mapAttrs (_:\n- pkgs.callPackage ./package/rpm.nix {\n- meta = commonMeta // rpmMeta;\n- buildSourcePackage = true;\n- }) binaries;\n-\n# Bundle the contents of a package set together, leaving the original attrs intact\nbundle = name: pkgSet:\npkgSet // (pkgs.buildEnv {\n@@ -31,7 +21,7 @@ let\npaths = builtins.attrValues pkgSet;\n});\n- artifacts = { inherit binaries rpm rpmSource; };\n+ artifacts = { inherit binaries; };\nbundled = builtins.mapAttrs bundle artifacts;\nin bundled\n"
},
{
"change_type": "DELETE",
"old_path": "nix/package/rpm.nix",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: MPL-2.0\n-{ stdenv, writeTextFile, gnutar, rpm, buildFHSUserEnv\n-, buildSourcePackage ? false, meta }:\n-pkg:\n-\n-let\n- project = pkg.meta.name;\n- version = meta.version;\n- release = meta.release;\n- arch = meta.arch;\n- pkgName = \"${project}-${version}-${release}.${arch}\";\n- licenseFile = meta.licenseFile;\n-\n- rpmbuild-env = buildFHSUserEnv {\n- name = \"rpmbuild-env\";\n- multiPkgs = pkgs: [ rpm ];\n- runScript = \"rpmbuild\";\n- };\n-\n- writeSpecFile = writeTextFile {\n- name = \"${project}.spec\";\n- text = ''\n- %define debug_package %{nil}\n- # %define _unpackaged_files_terminate_build 0\n- Name: ${project}\n- Version: ${version}\n- Release: ${release}\n- Epoch: ${meta.epoch}\n- Summary: ${pkg.meta.description}\n- License: ${meta.license}\n- BuildArch: ${arch}\n- Source0: ${project}-${version}.tar.gz\n- Source1: https://gitlab.com/tezos/tezos/tree/${meta.branchName}/\n- %description\n- ${pkg.meta.description}\n- Supports ${pkg.meta.supports}\n- Maintainer: ${meta.maintainer}\n- %prep\n- %setup -q\n- %build\n- %install\n- mkdir -p %{buildroot}/%{_bindir}\n- install -m 0755 * %{buildroot}/%{_bindir}\n- %files\n- %license LICENSE\n- %{_bindir}/*\n- '';\n- };\n-\n- sourceArchive = stdenv.mkDerivation rec {\n- name = \"${project}-${version}.tar.gz\";\n-\n- phases = \"archivePhase\";\n-\n- archivePhase = ''\n- mkdir ${project}-${version}\n- cp ${licenseFile} ${project}-${version}/LICENSE\n- cp ${pkg}/bin/* ${project}-${version}/\n- tar -cvzf ${name} ${project}-${version}\n- cp ${name} $out\n- '';\n- };\n-\n-in stdenv.mkDerivation rec {\n- rpmBuildFlag = if buildSourcePackage then \"-bs\" else \"-bb\";\n- name = \"${pkgName}.rpm\";\n-\n- phases = \"packagePhase\";\n-\n- buildInputs = [ rpmbuild-env ];\n-\n- packagePhase = ''\n- HOME=$PWD\n- mkdir rpmbuild\n- cd rpmbuild\n- mkdir SPECS\n- mkdir SOURCES\n- cp ${writeSpecFile} SPECS/${project}.spec\n- cp ${sourceArchive} SOURCES/${sourceArchive.name}\n- mkdir -p BUILD/${project}\n- cp ${licenseFile} BUILD/${project}/LICENSE\n- rpmbuild-env ${rpmBuildFlag} SPECS/${project}.spec --define '_bindir /usr/bin' --define '_datadir /usr/share'\n- mkdir -p $out\n- ${if buildSourcePackage then\n- \"cp SRPMS/*.src.rpm $out/\"\n- else\n- \"cp RPMS/*/*.rpm $out/\"}\n- '';\n-\n-}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#62] Prune nix-based fedora packaging
Problem: Now we have nix-less way for creating fedora packages.
Nix-based way is redundant now.
Solution: Remove nix-based way for fedora packaging.
|
603,652
|
23.09.2020 15:56:34
| -10,800
|
f2f8894df97ad677047e72126cc400d60099f57f
|
Update READMEs
Problem: Now we have docker-based way for Fedora packaging.
Also, our Fedora packages now have systemd packages.
Solution: Update README about docker-based building.
Restructure root README in order to explain multiple ways
for running systemd units with tezos binaries.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -36,32 +36,6 @@ sudo apt-get install tezos-baker-006-pscartha\n```\nOnce you install such packages the commands `tezos-*` will be available.\n-### Systemd units for `tezos-node` and daemons\n-\n-`tezos-node`, `tezos-accuser-006-pscartha`, `tezos-baker-006-pscartha` and\n-`tezos-endorser-006-pscartha` packages have systemd files included to the\n-package.\n-\n-Once you've installed the packages with systemd unit, you can run the service\n-with the binary from the package using the following command:\n-```\n-systemctl start <package-name>.service\n-```\n-To stop the service run:\n-```\n-systemctl stop <package-name>.service\n-```\n-\n-Each service has configuration file located in `/etc/default`. Default\n-configurations can be found [here](docker/package/defaults/).\n-\n-Files created by the services will be located in `/var/lib/tezos/` by default.\n-`tezos-{accuser, baker, endorser}-006-pscartha` services can have configurable\n-data directory.\n-\n-`tezos-{accuser, endorser}` have configurable node address, so that they can be used with both\n-remote and local node.\n-\n## Fedora Copr repository with `tezos-*` binaries\nIf you are using Fedora you can use Copr in order to install `tezos-*`\n@@ -92,9 +66,39 @@ chmod +x tezos-client\nRun `./tezos-client` or add it to your PATH to be able to run it anywhere.\n-### Systemd units for `tezos-node` and daemons\n+## Systemd units for `tezos-node` and daemons\n+\n+### Systemd units on Ubuntu or Fedora\n+\n+`tezos-node`, `tezos-accuser-006-pscartha`, `tezos-baker-006-pscartha` and\n+`tezos-endorser-006-pscartha` packages have systemd files included to the\n+Ubuntu and Fedora packages.\n+\n+Once you've installed the packages with systemd unit, you can run the service\n+with the binary from the package using the following command:\n+```\n+systemctl start <package-name>.service\n+```\n+To stop the service run:\n+```\n+systemctl stop <package-name>.service\n+```\n+\n+Each service has configuration file located in `/etc/default`. Default\n+configurations can be found [here](docker/package/defaults/).\n+\n+Files created by the services will be located in `/var/lib/tezos/` by default.\n+`tezos-{accuser, baker, endorser}-<protocol>` services can have configurable\n+data directory.\n+\n+`tezos-{accuser, endorser}` have configurable node address, so that they can be used with both\n+remote and local node.\n+\n+### Systemd units on other systems\n+\n+If you're not using Ubuntu or Fedora you can still construct systemd units for binaries\n+from scratch.\n-You can set up `tezos-node` and `baker/endorser/accuser` daemons as a systemd unit.\nFor this you'll need `.service` file to define systemd service. The easiest way\nto get one is to run [`gen_systemd_service_file.py`](gen_systemd_service_file.py).\nYou should specify service name as a first argument and optionally provide target protocol\n@@ -110,6 +114,7 @@ Apart, from `.service` file you'll need service startup script and default confi\nfile, they can be found in [`scripts`](./docker/package/scripts) and\n[`defaults`](./docker/package/defaults) folders respectively.\n+\n## Build Instructions\nThis repository provides two distinct ways for building and packaging tezos binaries:\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/README.md",
"new_path": "docker/README.md",
"diff": "@@ -48,9 +48,9 @@ Once this is done you should run the following command to build `aarch64` static\nWe provide a way to build both binary and source native Ubuntu packages.\n-[`docker-ubuntu-packages.sh`](docker-ubuntu-packages.sh) will build source or binary\n-packages depending on the passed argument (`source` and `binary` respectively).\n-This script builds packages inside docker image defined in [Dockerfile](package/Dockerfile).\n+[`docker-tezos-packages.sh`](docker-tezos-packages.sh) script with `ubuntu` argument\n+will build source or binary packages depending on the passed argument (`source` and `binary` respectively).\n+This script builds packages inside docker image defined in [Dockerfile-ubuntu](package/Dockerfile-ubuntu).\nThis script uses [python script](package/package_generator.py) which generates meta information for\ntezos packages based on information defined in [meta.json](../meta.json) and current tezos\nversion defined in [sources.json](../nix/nix/sources.json) and build native ubuntu packages.\n@@ -61,15 +61,15 @@ In order to build binary `.deb` packages specify `TEZOS_VERSION` and\nrun the following command:\n```\nexport TEZOS_VERSION=\"v7.3\"\n-cd .. && ./docker/docker-ubuntu-packages.sh binary\n+cd .. && ./docker/docker-tezos-packages.sh ubuntu binary\n```\nIt is also possible to build single package. In order to do that run the following:\n```\n-# cd .. && ./docker/docker-ubuntu-packages.sh binary <tezos-binary-name>\n+# cd .. && ./docker/docker-tezos-packages.sh ubuntu binary <tezos-binary-name>\n# Example for baker\nexport TEZOS_VERSION=\"v7.3\"\n-cd .. && ./docker/docker-ubuntu-packages.sh binary tezos-baker-006-PsCARTHA\n+cd .. && ./docker/docker-tezos-packages.sh ubuntu binary tezos-baker-006-PsCARTHA\n```\nThe build can take some time due to the fact that we build tezos and its dependencies\n@@ -87,9 +87,9 @@ sudo apt install <path to deb file>\nIn order to build source packages run the following commands:\n```\nexport TEZOS_VERSION=\"v7.3\"\n-cd .. && ./docker/docker-ubuntu-packages.sh source\n+cd .. && ./docker/docker-tezos-packages.sh ubuntu source\n# you can also build single source package\n-cd .. && ./docker/docker-ubuntu-packages.sh source tezos-baker-006-PsCARTHA\n+cd .. && ./docker/docker-tezos-packages.sh ubuntu source tezos-baker-006-PsCARTHA\n```\nOnce the packages build is complete `../out` directory will contain files required\n@@ -120,3 +120,49 @@ command for each `.changes` file:\n```\ndput ppa:serokell/tezos ../out/<package>.changes\n```\n+\n+## Fedora packages\n+\n+We provide a way to build both binary(`.rpm`) and source(`.src.rpm`) native Fedora packages.\n+\n+[`docker-tezos-packages.sh`](docker-tezos-packages.sh) script with `fedora` argument\n+will build source or binary packages depending on the passed argument (`source` and `binary` respectively).\n+\n+### `.rpm` packages\n+\n+In order to build binary `.rpm` packages specify `TEZOS_VERSION` and\n+run the following command:\n+```\n+export TEZOS_VERSION=\"v7.3\"\n+cd .. && ./docker/docker-tezos-packages.sh fedora binary\n+```\n+\n+It is also possible to build single package. In order to do that run the following:\n+```\n+# cd .. && ./docker/docker-tezos-packages.sh fedora binary <tezos-binary-name>\n+# Example for baker\n+export TEZOS_VERSION=\"v7.3\"\n+cd .. && ./docker/docker-tezos-packages.sh fedora binary tezos-baker-006-PsCARTHA\n+```\n+\n+The build can take some time due to the fact that we build tezos and its dependencies\n+from scratch for each package individually.\n+\n+Once the build is completed the packages will be located in `../out` directory.\n+\n+In order to install `.rpm` package run the following command:\n+```\n+sudo yum localinstall <path to rpm file>\n+```\n+\n+### `.src.rpm` packages\n+\n+In order to build source packages run the following commands:\n+```\n+export TEZOS_VERSION=\"v7.3\"\n+cd .. && ./docker/docker-tezos-packages.sh fedora source\n+# you can also build single source package\n+cd .. && ./docker/docker-tezos-packages.sh fedora source tezos-baker-006-PsCARTHA\n+```\n+\n+Resulting `.src.rpm` packages can be either built locally or submitted to the Copr.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#62] Update READMEs
Problem: Now we have docker-based way for Fedora packaging.
Also, our Fedora packages now have systemd packages.
Solution: Update README about docker-based building.
Restructure root README in order to explain multiple ways
for running systemd units with tezos binaries.
|
603,652
|
13.10.2020 11:50:19
| -10,800
|
a63a65f19e554f930b802a9a20a05a30aa9fb6c7
|
Fix version fetching in autoreleases
Problem: In tezos sources ref was changed, however, meta builder
wasn't updated, thus autoreleasing was broken.
Solution: Fix meta building.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -8,7 +8,7 @@ let\nsource = (import ./nix/nix/sources.nix).tezos;\nmeta = builtins.fromJSON (builtins.readFile ./meta.json);\ncommonMeta = {\n- version = builtins.replaceStrings [ \"v\" ] [ \"\" ] source.ref;\n+ version = builtins.replaceStrings [ \"refs/tags/v\" ] [ \"\" ] source.ref;\nlicense = \"MPL-2.0\";\ndependencies = \"\";\nbranchName = source.ref;\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix version fetching in autoreleases
Problem: In #92 tezos sources ref was changed, however, meta builder
wasn't updated, thus autoreleasing was broken.
Solution: Fix meta building.
|
603,652
|
29.09.2020 10:37:03
| -10,800
|
66d964ee5901f8fd0128f3d5cb4047e7cec2d76a
|
Fix default sources in ocaml-overlay.nix
Problem: There is invalid default path in ocaml-overlay.nix.
However, we want to use this overlay in on of our projects.
Solution: Fix default path.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/ocaml-overlay.nix",
"new_path": "nix/build/ocaml-overlay.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ sources ? import ./nix/sources.nix\n+{ sources ? import ../nix/sources.nix\n, protocols ? builtins.fromJSON (builtins.readFile ../../protocols.json)\n, hacks ? import ./hacks.nix\n, pkgs ? import sources.nixpkgs { }, opam-nix ? import sources.opam-nix pkgs }:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix default sources in ocaml-overlay.nix
Problem: There is invalid default path in ocaml-overlay.nix.
However, we want to use this overlay in on of our projects.
Solution: Fix default path.
|
603,652
|
15.10.2020 10:44:45
| -10,800
|
38ee94917d0ed4220ae8f048b0894799a7f28cf2
|
Handle fedora and ubuntu epoches separately
Problem: We want to bump only ubuntu packages epoch.
Solution: No longer keep epoch common for both fedora and ubuntu
packages. Remove epch from meta.json and hardcode it in the python
script separately for ubuntu and fedora.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -56,7 +56,11 @@ active_protocols = json.load(open(\"../protocols.json\", \"r\"))[\"active\"]\nversion = os.environ[\"TEZOS_VERSION\"][1:]\nrelease = f\"{meta['release']}\"\n-package_version = f\"{meta['epoch']}:0ubuntu{version}-{release}\"\n+\n+ubuntu_epoch = 2\n+fedora_epoch = 1\n+\n+package_version = f\"{ubuntu_epoch}:0ubuntu{version}-{release}\"\npwd = os.getcwd()\nhome = os.environ[\"HOME\"]\n@@ -121,7 +125,7 @@ systemctl enable %{{name}}.service\nName: {full_package_name}\nVersion: {version}\nRelease: {release}\n-Epoch: 1\n+Epoch: {fedora_epoch}\nSummary: {pkg.desc}\nLicense: MPL-2.0\nBuildArch: x86_64\n"
},
{
"change_type": "MODIFY",
"old_path": "meta.json",
"new_path": "meta.json",
"diff": "{\n\"release\": \"2\",\n- \"epoch\": \"1\",\n\"maintainer\": \"Serokell <hi@serokell.io>\"\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#95] Handle fedora and ubuntu epoches separately
Problem: We want to bump only ubuntu packages epoch.
Solution: No longer keep epoch common for both fedora and ubuntu
packages. Remove epch from meta.json and hardcode it in the python
script separately for ubuntu and fedora.
|
603,652
|
15.10.2020 10:46:29
| -10,800
|
3c850d4b378a40506cc2657d5e85f1c7fbfeca9e
|
Change ubuntu versioning
Problem: Current ubuntu versioning scheme is incorrect and may
confuse users.
Solution: Use proper versioning scheme:
<package-name>_<upstream-version>-0ubuntu<release-number>.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -60,8 +60,6 @@ release = f\"{meta['release']}\"\nubuntu_epoch = 2\nfedora_epoch = 1\n-package_version = f\"{ubuntu_epoch}:0ubuntu{version}-{release}\"\n-\npwd = os.getcwd()\nhome = os.environ[\"HOME\"]\n@@ -171,7 +169,7 @@ install: {pkg.get_full_name()}\nf.write(makefile_contents)\ndef gen_changelog(pkg: Package, ubuntu_version, maintainer, date, out):\n- changelog_contents = f'''{pkg.get_full_name().lower()} ({package_version}) {ubuntu_version}; urgency=medium\n+ changelog_contents = f'''{pkg.get_full_name().lower()} ({ubuntu_epoch}:{version}-0ubuntu{release}) {ubuntu_version}; urgency=medium\n* Publish {version}-{release} version of {pkg.name}\n@@ -234,7 +232,7 @@ for protocol in active_protocols:\nfor package in packages:\nif package_to_build is None or package.get_full_name() == package_to_build:\nif is_ubuntu:\n- dir = f\"{package.get_full_name().lower()}-0ubuntu{version}\"\n+ dir = f\"{package.get_full_name().lower()}-{version}\"\nelse:\ndir = f\"{package.get_full_name()}-{version}\"\n# tezos-client and tezos-admin-client are in one opam package\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#95] Change ubuntu versioning
Problem: Current ubuntu versioning scheme is incorrect and may
confuse users.
Solution: Use proper versioning scheme:
<package-name>_<upstream-version>-0ubuntu<release-number>.
|
603,652
|
21.10.2020 12:39:43
| -10,800
|
e234822f3969e29c65f9423abd33fb22d3179f1f
|
Add timeout for packages building
Problem: Sometimes packages building can stuck due to some
weird opam errors. Such behaviour can silently block CI.
Solution: Normally, each step should take more than 10-15 minutes, and
we double the timemout just in case.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -66,6 +66,7 @@ steps:\nartifact_paths:\n- ./out/*\nbranches: \"!master\"\n+ timeout_in_minutes: 30\n- label: test deb binary packages via podman\ncommands:\n- eval \"$SET_VERSION\"\n@@ -74,6 +75,7 @@ steps:\n- ./docker/docker-tezos-packages.sh ubuntu binary tezos-baker-006-PsCARTHA\n- rm -rf out\nbranches: \"!master\"\n+ timeout_in_minutes: 30\n- label: test rpm source packages via podman\ncommands:\n- eval \"$SET_VERSION\"\n@@ -81,6 +83,7 @@ steps:\nartifact_paths:\n- ./out/*\nbranches: \"!master\"\n+ timeout_in_minutes: 30\n- label: test rpm binary packages via podman\ncommands:\n- eval \"$SET_VERSION\"\n@@ -89,6 +92,7 @@ steps:\n- ./docker/docker-tezos-packages.sh fedora binary tezos-baker-007-PsDELPH1\n- rm -rf out\nbranches: \"!master\"\n+ timeout_in_minutes: 30\n- wait\n- label: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add timeout for packages building
Problem: Sometimes packages building can stuck due to some
weird opam errors. Such behaviour can silently block CI.
Solution: Normally, each step should take more than 10-15 minutes, and
we double the timemout just in case.
|
603,652
|
06.10.2020 12:15:01
| -10,800
|
3462b9f278e37e4a96102bd42ff264671bf8a709
|
Make node data dir configurable
Problem: Currently it's impossible to run multiple services with
tezos-nodes simultaneously, because node data dir is hardcoded in the
startup script.
Solution: Make data dir configurable in the config file and use this
data directory in a startup script.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/defaults/tezos-node.conf",
"new_path": "docker/package/defaults/tezos-node.conf",
"diff": "# SPDX-License-Identifier: MPL-2.0\n# shellcheck disable=SC2034\n+DATA_DIR=\"/var/lib/tezos/node\"\nNODE_RPC_PORT=\"8732\"\nNETWORK=\"carthagenet\"\nCERT_PATH=\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-start",
"new_path": "docker/package/scripts/tezos-node-start",
"diff": "set -euo pipefail\n-: \"${BIN_DIR:=\"/usr/bin\"}\"\n-: \"${DATA_DIR:=\"/var/lib/tezos\"}\"\n+node=\"/usr/bin/tezos-node\"\n-node=\"$BIN_DIR/tezos-node\"\n-node_dir=\"$DATA_DIR/node\"\n-node_data_dir=\"$node_dir/data\"\n-\n-mkdir -p \"$node_data_dir\"\n-if [ ! -f \"$node_data_dir/config.json\" ]; then\n+mkdir -p \"$DATA_DIR\"\n+if [ ! -f \"$DATA_DIR/config.json\" ]; then\necho \"Configuring the node...\"\n\"$node\" config init \\\n- --data-dir \"$node_data_dir\" \\\n+ --data-dir \"$DATA_DIR\" \\\n--rpc-addr \":$NODE_RPC_PORT\" \\\n--network \"$NETWORK\"\n\"$@\"\nelse\necho \"Updating the node configuration...\"\n\"$node\" config update \\\n- --data-dir \"$node_data_dir\" \\\n+ --data-dir \"$DATA_DIR\" \\\n--rpc-addr \":$NODE_RPC_PORT\" \\\n--network \"$NETWORK\"\n\"$@\"\nfi\n# Generate a new identity if not present\n-if [ ! -f \"$node_data_dir/identity.json\" ]; then\n+if [ ! -f \"$DATA_DIR/identity.json\" ]; then\necho \"Generating a new node identity...\"\n\"$node\" identity generate \"${IDENTITY_POW:-26}\". \\\n- --data-dir \"$node_data_dir\"\n+ --data-dir \"$DATA_DIR\"\nfi\n# Launching the node\nif [[ -z \"$CERT_PATH\" || -z \"$KEY_PATH\" ]]; then\n- exec \"$node\" run --data-dir \"$node_data_dir\"\n+ exec \"$node\" run --data-dir \"$DATA_DIR\"\nelse\n- exec \"$node\" run --data-dir \"$node_data_dir\" --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\n+ exec \"$node\" run --data-dir \"$DATA_DIR\" --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\nfi\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#79] Make node data dir configurable
Problem: Currently it's impossible to run multiple services with
tezos-nodes simultaneously, because node data dir is hardcoded in the
startup script.
Solution: Make data dir configurable in the config file and use this
data directory in a startup script.
|
603,652
|
06.10.2020 12:20:07
| -10,800
|
15f1c0370138ce2fdbde447e05c37d727c19802a
|
Make node data dir configurable for baker
Problem: Node data dir is also hardcoded in the baker startup script,
thus it's impossible to run baker on different nodes.
Solution: Make node data dir configurable there as well.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-baker-start",
"new_path": "docker/package/scripts/tezos-baker-start",
"diff": "@@ -10,7 +10,6 @@ set -euo pipefail\nbaker=\"/usr/bin/tezos-baker-$PROTOCOL\"\nbaker_dir=\"$DATA_DIR\"\n-node_data_dir=\"/var/lib/tezos/node/data\"\nbaker_config=\"$baker_dir/config\"\nmkdir -p \"$baker_dir\"\n@@ -28,7 +27,7 @@ fi\nlaunch_baker() {\nexec \"$baker\" \\\n--base-dir \"$baker_dir\" --port \"$NODE_RPC_PORT\" \\\n- run with local node \"$node_data_dir\" \"$@\"\n+ run with local node \"$NODE_DATA_DIR\" \"$@\"\n}\nif [[ -z \"$BAKER_ACCOUNT\" ]]; then\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#79] Make node data dir configurable for baker
Problem: Node data dir is also hardcoded in the baker startup script,
thus it's impossible to run baker on different nodes.
Solution: Make node data dir configurable there as well.
|
603,652
|
06.10.2020 12:44:02
| -10,800
|
458017a78ed3f11d108ce35b7817a3544ab931e1
|
Update README
Describe how to adjust systemd related files to run multiple similar
services with tezos binaries.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -12,6 +12,13 @@ This repo provides various form of distribution for tezos-related executables\n(`tezos-client`, `tezos-client-admin`, `tezos-node`, `tezos-baker`,\n`tezos-accuser`, `tezos-endorser`, `tezos-signer` and `tezos-protocol-compiler`).\n+Daemon binaries (as well as packages for them) have suffix that defines their target protocol,\n+e.g. `tezos-baker-007-PsDELPH1` can be used only on the chain with 007 protocol.\n+\n+Other binaries can be used with all protocols if they're new enough. E.g.\n+007 protocol is supported only from `v7.4`. `tezos-node` can be set up to run\n+different networks, you can read more about this in [this article](https://tezos.gitlab.io/user/multinetwork.html).\n+\n## Obtain binaries from github release\nRecomended way to get these binaries is to download them from assets from github release.\n@@ -70,8 +77,8 @@ Run `./tezos-client` or add it to your PATH to be able to run it anywhere.\n### Systemd units on Ubuntu or Fedora\n-`tezos-node`, `tezos-accuser-006-pscartha`, `tezos-baker-006-pscartha` and\n-`tezos-endorser-006-pscartha` packages have systemd files included to the\n+`tezos-node`, `tezos-accuser-<proto>`, `tezos-baker-<proto>` and\n+`tezos-endorser-<proto>` packages have systemd files included to the\nUbuntu and Fedora packages.\nOnce you've installed the packages with systemd unit, you can run the service\n@@ -101,20 +108,43 @@ from scratch.\nFor this you'll need `.service` file to define systemd service. The easiest way\nto get one is to run [`gen_systemd_service_file.py`](gen_systemd_service_file.py).\n-You should specify service name as a first argument and optionally provide target protocol\n-as a second argument, e.g.:\n+You should specify service name as an argument. Note that there are three\n+predefined services for `tezos-node`: `tezos-node-{mainnet, carthagenet, delphinet}`.\n+\n+E.g.:\n```\n-./gen_systemd_service_file.py tezos-node\n+./gen_systemd_service_file.py tezos-node-mainnet\n# or\n-./gen_systemd_service_file.py tezos-baker 006-PsCARTHA\n+./gen_systemd_service_file.py tezos-baker-007-PsDELPH1\n```\nAfter that you'll have `.service` file in the current directory.\n-Apart, from `.service` file you'll need service startup script and default configuration\n+Apart from `.service` file you'll need service startup script and default configuration\nfile, they can be found in [`scripts`](./docker/package/scripts) and\n[`defaults`](./docker/package/defaults) folders respectively.\n+### Multiple similar systemd services\n+\n+It's possible to run multiple same services, e.g. two `tezos-node`s that run different\n+networks.\n+\n+`tezos-node` packages provide three services out of the box:\n+`tezos-node-delphinet`, `tezos-node-carthagenet` and `tezos-node-mainnet` that run\n+`delphinet`, `carthagenet` and `mainnet` networks respectively.\n+\n+In order to start it run:\n+```\n+systemctl start tezos-node-<network>\n+```\n+\n+Another case for running multiple similar systemd services is when one wants to have\n+multiple daemons that target different protocols.\n+Since daemons for different protocols are provided in the different packages, they will\n+have different service files. The only thing that needs to be changed is config file.\n+One should provide desired node address, data directory for daemon files and node directory\n+(however, this is the case only for baker daemon).\n+\n## Build Instructions\nThis repository provides two distinct ways for building and packaging tezos binaries:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#79] Update README
Describe how to adjust systemd related files to run multiple similar
services with tezos binaries.
|
603,652
|
23.10.2020 17:11:02
| -10,800
|
ac72fa57440c5470038d36895869c6bbb4e429d3
|
Bump nixpkgs
Problem: Current nixpkgs version is quite old and doesn't use our fork.
Solution: Use revision from our fork that uses most of our repos.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "{\n\"nixpkgs\": {\n- \"branch\": \"nixos-unstable\",\n+ \"branch\": \"master\",\n\"description\": \"Pinned Nixpkgs tree (master follows nixos-unstable-small, only tags have stable history)\",\n\"homepage\": \"\",\n- \"owner\": \"nixos\",\n- \"repo\": \"nixpkgs-channels\",\n- \"rev\": \"3320a06049fc259e87a2bd98f4cd42f15f746b96\",\n- \"sha256\": \"1g5l186d5xh187vdcpfsz1ff8s749949c1pclvzfkylpar09ldkl\",\n+ \"owner\": \"serokell\",\n+ \"repo\": \"nixpkgs\",\n+ \"rev\": \"66a26e65eb7f9b6cb3f773052da0cd3ac52f015c\",\n+ \"sha256\": \"09ab1wywcwhqlwy566y00h6q8c7x64qvdk2b82jvadixbanx46wh\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/nixos/nixpkgs-channels/archive/3320a06049fc259e87a2bd98f4cd42f15f746b96.tar.gz\",\n+ \"url\": \"https://github.com/serokell/nixpkgs/archive/66a26e65eb7f9b6cb3f773052da0cd3ac52f015c.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"opam-nix\": {\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#84] Bump nixpkgs
Problem: Current nixpkgs version is quite old and doesn't use our fork.
Solution: Use revision from our fork that uses most of our repos.
|
603,652
|
23.10.2020 17:13:12
| -10,800
|
da5a3e608cf7417ec0021d603fc8cc4bf602de83
|
Adjust hacks.nix and static overlay.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "# This file needs to become empty.\nself: super: oself: osuper:\n-with oself; {\n+with oself; rec {\n+ ocaml = self.ocaml-ng.ocamlPackages_4_09.ocaml.overrideAttrs (o: o // {\n+ hardeningDisable = o.hardeningDisable ++\n+ self.stdenv.lib.optional self.stdenv.hostPlatform.isMusl \"pie\";\n+ });\n# FIXME opam-nix needs to do this\nocamlfind = findlib;\n+ ocamlgraph = osuper.ocamlgraph.override (_: { gtkSupport = false; });\n+\n# FIXME opam-nix needs to do version resolution\nezjsonm = osuper.ezjsonm.versions.\"1.1.0\";\n- ipaddr = osuper.ipaddr.versions.\"4.0.0\";\n+ ipaddr = osuper.ipaddr.versions.\"4.0.0\".overrideAttrs (_: {\n+ minimumOCamlVersion = \"4.07\";\n+ });\n+\n+ # Here we pin old tls version because more recent versions\n+ # cannot be build with dune < 2.0.0, which will require\n+ # to override dune version for huge amount of dependencies.\n+ # Also opam-nix currently unable to build tls package, so\n+ # we build it in a bit hacky way.\n+ tls = osuper.tls.versions.\"0.10.6\".overrideAttrs (o: {\n+ outputs = [ \"out\" ];\n+ buildInputs = o.buildInputs ++ [ topkg ];\n+ buildPhase = ''\n+ ${topkg.run} build --tests false --with-mirage false --with-lwt true\n+ '';\n+ checkPhase = \"${topkg.run} test\";\n+ inherit (topkg) installPhase;\n+ });\n+ x509 = osuper.x509.versions.\"0.9.0\";\nconduit = osuper.conduit.versions.\"2.1.0\".overrideAttrs (oa: rec {\n- buildInputs = [ oself.tls ] ++ oa.buildInputs;\n+ buildInputs = [ tls ] ++ oa.buildInputs;\npropagatedBuildInputs = buildInputs;\n+ minimumOCamlVersion = \"4.07\";\n});\nconduit-lwt-unix = osuper.conduit-lwt-unix.versions.\"2.0.2\";\ncohttp-lwt-unix = osuper.cohttp-lwt-unix.versions.\"2.4.0\";\ncohttp-lwt = osuper.cohttp-lwt.versions.\"2.4.0\";\n- macaddr = osuper.macaddr.versions.\"4.0.0\";\n+ macaddr = osuper.macaddr.versions.\"4.0.0\".overrideAttrs (_: {\n+ minimumOCamlVersion = \"4.07\";\n+ });\n- lwt = lwt4;\n+ lwt = osuper.lwt.versions.\"4.2.1\";\n# FIXME opam-nix needs to handle \"external\" (native) dependencies correctly\nconf-gmp = self.gmp;\n@@ -57,5 +84,7 @@ with oself; {\n});\ntezos-node =\n- osuper.tezos-node.overrideAttrs (_: { postInstall = \"rm $bin/*.sh\"; });\n+ osuper.tezos-node.overrideAttrs (o: rec {\n+ postInstall = \"rm $bin/*.sh\";\n+ });\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/static-overlay.nix",
"new_path": "nix/build/static-overlay.nix",
"diff": "@@ -15,7 +15,6 @@ let\nmakeStatic pkg [ self.libusb1 self.hidapi ]\n\"-lusb-1.0 -lhidapi-libusb -ludev\";\nin {\n- ocaml = self.ocaml-ng.ocamlPackages_4_07.ocaml;\nlibev = dds super.libev;\nlibusb1 = dds (super.libusb1.override {\nsystemd = self.eudev;\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#84] Adjust hacks.nix and static overlay.
|
603,652
|
04.11.2020 14:55:58
| -10,800
|
f766cc007d14b3d0361f58363ce115ab1c07cd2f
|
Switch to gh
Problem: There is an official CLI from github, now it can handle
releases.
Solution: Switch to it from hub tool.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -27,19 +27,15 @@ shopt -s extglob\ncp -L \"$TEMPDIR\"/\"$project\"/!(*.md) \"$assets_dir\"\n# Delete release if it exists\n-hub release delete auto-release || true\n+gh release delete auto-release --yes || true\n# Update the tag\ngit fetch # So that the script can be run from an arbitrary checkout\ngit tag -f auto-release\ngit push --force --tags\n-# Combine all assets\n-assets=()\n-for file in $assets_dir/*; do\n- echo $file\n- assets+=(\"-a\" $file)\n-done\n-\n# Create release\n-hub release create \"${assets[@]}\" -F \"$TEMPDIR\"/\"$project\"/release-notes.md --prerelease auto-release\n+gh release create -F \"$TEMPDIR\"/\"$project\"/release-notes.md --prerelease auto-release\n+\n+# Upload assets\n+gh release upload auto-release \"$assets_dir\"/*\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shell.nix",
"new_path": "scripts/shell.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs {} }:\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; } }:\nwith pkgs;\nmkShell {\n- buildInputs = [ gitAndTools.hub git rename ];\n+ buildInputs = [ gh git rename ];\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#97] Switch to gh
Problem: There is an official CLI from github, now it can handle
releases.
Solution: Switch to it from hub tool.
|
603,652
|
18.11.2020 11:12:27
| -10,800
|
ac4c097ee8ebf14e154bfb621ebe996f547fce1f
|
Switch back to docker
Problem: Podman turned out to be quite unreliable.
Solution: Switch back to docker, since we now have a dedicated agent
with access to the docker.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "env:\nSET_VERSION: \"export TEZOS_VERSION=\\\"$(cat nix/nix/sources.json | jq -r '.tezos.ref' | cut -d'/' -f3)\\\"\"\n- USE_PODMAN: \"True\"\nsteps:\n- label: reuse lint\n@@ -28,7 +27,7 @@ steps:\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./binaries/bin\nbranches: \"!master\"\n- - label: build via podman\n+ - label: build via docker\ncommands:\n- eval \"$SET_VERSION\"\n- cd docker\n@@ -36,13 +35,14 @@ steps:\n- nix run -f.. pkgs.upx -c upx tezos-*\nartifact_paths:\n- ./docker/tezos-*\n+ agents:\n+ queue: \"docker\"\n# arm builer is an ubuntu machine without nix\n- label: build arm via docker\ncommands:\n- eval \"$SET_VERSION\"\n- cd docker\n- # arm builder doesn't have podman installed\n- - USE_PODMAN=\"False\" ./docker-static-build.sh\n+ - ./docker-static-build.sh\n- upx tezos-*\n- >\nfor f in ./tezos-*; do\n@@ -52,14 +52,18 @@ steps:\n- ./docker/tezos-*\nagents:\nqueue: \"arm64-build\"\n+\n+ # binaries built by docker are tested on the another machine,\n+ # so we should wait for docker build to finish\n+ - wait\n- label: test docker-built binaries\ncommands:\n- - buildkite-agent artifact download \"docker/*\" . --step \"build via podman\"\n+ - buildkite-agent artifact download \"docker/*\" . --step \"build via docker\"\n- chmod +x ./docker/*\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\nbranches: \"!master\"\n- - label: test deb source packages via podman\n+ - label: test deb source packages via docker\ncommands:\n- eval \"$SET_VERSION\"\n- ./docker/docker-tezos-packages.sh ubuntu source\n@@ -67,7 +71,9 @@ steps:\n- ./out/*\nbranches: \"!master\"\ntimeout_in_minutes: 30\n- - label: test deb binary packages via podman\n+ agents:\n+ queue: \"docker\"\n+ - label: test deb binary packages via docker\ncommands:\n- eval \"$SET_VERSION\"\n# Building all binary packages will take significant amount of time, so we build only one\n@@ -76,7 +82,9 @@ steps:\n- rm -rf out\nbranches: \"!master\"\ntimeout_in_minutes: 30\n- - label: test rpm source packages via podman\n+ agents:\n+ queue: \"docker\"\n+ - label: test rpm source packages via docker\ncommands:\n- eval \"$SET_VERSION\"\n- ./docker/docker-tezos-packages.sh fedora source\n@@ -84,7 +92,9 @@ steps:\n- ./out/*\nbranches: \"!master\"\ntimeout_in_minutes: 30\n- - label: test rpm binary packages via podman\n+ agents:\n+ queue: \"docker\"\n+ - label: test rpm binary packages via docker\ncommands:\n- eval \"$SET_VERSION\"\n# Building all binary packages will take significant amount of time, so we build only one\n@@ -93,13 +103,15 @@ steps:\n- rm -rf out\nbranches: \"!master\"\ntimeout_in_minutes: 30\n+ agents:\n+ queue: \"docker\"\n- wait\n- label: create auto pre-release\ncommands:\n- mkdir binaries\n- mkdir arm-binaries\n- - buildkite-agent artifact download \"docker/*\" binaries --step \"build via podman\"\n+ - buildkite-agent artifact download \"docker/*\" binaries --step \"build via docker\"\n- buildkite-agent artifact download \"docker/*\" arm-binaries --step \"build arm via docker\"\n- ls binaries\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile-fedora",
"new_path": "docker/package/Dockerfile-fedora",
"diff": "@@ -20,4 +20,4 @@ RUN opam install opam-bundle=0.4 --yes\nCOPY docker/package/*.py /tezos-packaging/docker/package/\nCOPY docker/package/defaults /tezos-packaging/docker/package/defaults\nCOPY docker/package/scripts /tezos-packaging/docker/package/scripts\n-ENTRYPOINT [\"python3\", \"-m\", \"package.package_generator.py\"]\n+ENTRYPOINT [\"python3\", \"-m\", \"package.package_generator\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile-ubuntu",
"new_path": "docker/package/Dockerfile-ubuntu",
"diff": "@@ -20,4 +20,4 @@ RUN opam install opam-bundle=0.4 --yes\nCOPY docker/package/*.py /tezos-packaging/docker/package/\nCOPY docker/package/defaults /tezos-packaging/docker/package/defaults\nCOPY docker/package/scripts /tezos-packaging/docker/package/scripts\n-ENTRYPOINT [\"python3\", \"-m\", \"package.package_generator.py\"]\n+ENTRYPOINT [\"python3\", \"-m\", \"package.package_generator\"]\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Switch back to docker
Problem: Podman turned out to be quite unreliable.
Solution: Switch back to docker, since we now have a dedicated agent
with access to the docker.
|
603,652
|
18.11.2020 10:55:42
| -10,800
|
13dfdb8cf77f3bd4ecd13de96f4b8f430753a1aa
|
Deactivate 006 protocol
Problem: 007 protocol was activated on mainnet and carthagenet will die
soon, so it doesn't make much sense to maintain 006 protocol specific
binaries.
Solution: Move 006 from active to allowed in protocols.json.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -78,7 +78,7 @@ steps:\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 ubuntu binary tezos-baker-006-PsCARTHA\n+ - ./docker/docker-tezos-packages.sh ubuntu binary tezos-baker-007-PsDELPH1\n- rm -rf out\nbranches: \"!master\"\ntimeout_in_minutes: 30\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -39,7 +39,7 @@ sudo add-apt-repository ppa:serokell/tezos && sudo apt-get update\nsudo apt-get install tezos-client\n# dpkg-source prohibits uppercase in the packages names so the protocol\n# name is in lowercase\n-sudo apt-get install tezos-baker-006-pscartha\n+sudo apt-get install tezos-baker-007-psdelph1\n```\nOnce you install such packages the commands `tezos-*` will be available.\n@@ -52,11 +52,11 @@ E.g. in order to install `tezos-client` or `tezos-baker` run the following comma\n# use dnf\nsudo dnf copr enable @Serokell/Tezos\nsudo dnf install tezos-client\n-sudo dnf install tezos-baker-006-PsCARTHA\n+sudo dnf install tezos-baker-007-PsDELPH1\n# or use yum\nsudo yum copr enable @Serokell/Tezos\n-sudo yum install tezos-baker-006-PsCARTHA\n+sudo yum install tezos-baker-007-PsDELPH1\n```\nOnce you install such packages the commands `tezos-*` will be available.\n@@ -109,7 +109,7 @@ from scratch.\nFor this you'll need `.service` file to define systemd service. The easiest way\nto get one is to run [`gen_systemd_service_file.py`](gen_systemd_service_file.py).\nYou should specify service name as an argument. Note that there are three\n-predefined services for `tezos-node`: `tezos-node-{mainnet, carthagenet, delphinet}`.\n+predefined services for `tezos-node`: `tezos-node-{mainnet, delphinet}`.\nE.g.:\n```\n@@ -130,8 +130,8 @@ It's possible to run multiple same services, e.g. two `tezos-node`s that run dif\nnetworks.\n`tezos-node` packages provide three services out of the box:\n-`tezos-node-delphinet`, `tezos-node-carthagenet` and `tezos-node-mainnet` that run\n-`delphinet`, `carthagenet` and `mainnet` networks respectively.\n+`tezos-node-delphinet` and `tezos-node-mainnet` that run\n+`delphinet` and `mainnet` networks respectively.\nIn order to start it run:\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/README.md",
"new_path": "docker/README.md",
"diff": "@@ -69,7 +69,7 @@ It is also possible to build single package. In order to do that run the followi\n# cd .. && ./docker/docker-tezos-packages.sh ubuntu binary <tezos-binary-name>\n# Example for baker\nexport TEZOS_VERSION=\"v7.3\"\n-cd .. && ./docker/docker-tezos-packages.sh ubuntu binary tezos-baker-006-PsCARTHA\n+cd .. && ./docker/docker-tezos-packages.sh ubuntu binary tezos-baker-007-PsDELPH1\n```\nThe build can take some time due to the fact that we build tezos and its dependencies\n@@ -89,7 +89,7 @@ In order to build source packages run the following commands:\nexport TEZOS_VERSION=\"v7.3\"\ncd .. && ./docker/docker-tezos-packages.sh ubuntu source\n# you can also build single source package\n-cd .. && ./docker/docker-tezos-packages.sh ubuntu source tezos-baker-006-PsCARTHA\n+cd .. && ./docker/docker-tezos-packages.sh ubuntu source tezos-baker-007-PsDELPH1\n```\nOnce the packages build is complete `../out` directory will contain files required\n@@ -142,7 +142,7 @@ It is also possible to build single package. In order to do that run the followi\n# cd .. && ./docker/docker-tezos-packages.sh fedora binary <tezos-binary-name>\n# Example for baker\nexport TEZOS_VERSION=\"v7.3\"\n-cd .. && ./docker/docker-tezos-packages.sh fedora binary tezos-baker-006-PsCARTHA\n+cd .. && ./docker/docker-tezos-packages.sh fedora binary tezos-baker-007-PsDELPH1\n```\nThe build can take some time due to the fact that we build tezos and its dependencies\n@@ -162,7 +162,7 @@ In order to build source packages run the following commands:\nexport TEZOS_VERSION=\"v7.3\"\ncd .. && ./docker/docker-tezos-packages.sh fedora source\n# you can also build single source package\n-cd .. && ./docker/docker-tezos-packages.sh fedora source tezos-baker-006-PsCARTHA\n+cd .. && ./docker/docker-tezos-packages.sh fedora source tezos-baker-007-PsDELPH1\n```\nResulting `.src.rpm` packages can be either built locally or submitted to the Copr.\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -5,7 +5,7 @@ import os, shutil, sys, subprocess, json\nfrom .model import Service, ServiceFile, SystemdUnit, Unit, Package\n-networks = [\"mainnet\", \"carthagenet\", \"delphinet\"]\n+networks = [\"mainnet\", \"delphinet\"]\npackages = [\nPackage(\"tezos-client\",\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "\"003-PsddFKi3\",\n\"004-Pt24m4xi\",\n\"005-PsBABY5H\",\n- \"005-PsBabyM1\"\n+ \"005-PsBabyM1\",\n+ \"006-PsCARTHA\"\n],\n\"active\": [\n- \"006-PsCARTHA\",\n\"007-PsDELPH1\"\n]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -69,14 +69,14 @@ def test_node_with_daemons_scenario(network, use_tls=False):\nkill_node_with_daemons()\n-with subtest(\"run node with daemons on carthagenet\"):\n- test_node_with_daemons_scenario(\"carthagenet\")\n+with subtest(\"run node with daemons on delphinet\"):\n+ test_node_with_daemons_scenario(\"delphinet\")\nwith subtest(\"run node with daemons on mainnet\"):\ntest_node_with_daemons_scenario(\"mainnet\")\nwith subtest(\"run node with daemons using tls\"):\n- test_node_with_daemons_scenario(\"carthagenet\", use_tls=True)\n+ test_node_with_daemons_scenario(\"delphinet\", use_tls=True)\nwith subtest(\"test remote signer\"):\nmachine.succeed(f\"{tezos_signer} -d signer-dir gen keys signer\")\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-binaries.nix",
"new_path": "tests/tezos-binaries.nix",
"diff": "@@ -10,11 +10,11 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ pkgs, ... }:\ntestScript = ''\npath_to_binaries = \"${path-to-binaries}\"\n- tezos_accuser = f\"{path_to_binaries}/tezos-accuser-006-PsCARTHA\"\n+ tezos_accuser = f\"{path_to_binaries}/tezos-accuser-007-PsDELPH1\"\ntezos_admin_client = f\"{path_to_binaries}/tezos-admin-client\"\n- tezos_baker = f\"{path_to_binaries}/tezos-baker-006-PsCARTHA\"\n+ tezos_baker = f\"{path_to_binaries}/tezos-baker-007-PsDELPH1\"\ntezos_client = f\"{path_to_binaries}/tezos-client\"\n- tezos_endorser = f\"{path_to_binaries}/tezos-endorser-006-PsCARTHA\"\n+ tezos_endorser = f\"{path_to_binaries}/tezos-endorser-007-PsDELPH1\"\ntezos_node = f\"{path_to_binaries}/tezos-node\"\ntezos_signer = f\"{path_to_binaries}/tezos-signer\"\ntezos_codec = f\"{path_to_binaries}/tezos-codec\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Deactivate 006 protocol
Problem: 007 protocol was activated on mainnet and carthagenet will die
soon, so it doesn't make much sense to maintain 006 protocol specific
binaries.
Solution: Move 006 from active to allowed in protocols.json.
|
603,652
|
18.11.2020 14:32:59
| -10,800
|
0893145edaabfc161d6e74c092c2b6ed674469a4
|
Fetch token from vault
Problem: Buildkite agent was moved to another server and the file with
token now isn't presented in the filesystem.
Solution: Don't rely on file and fetch token directly from vault.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -114,5 +114,5 @@ steps:\n- buildkite-agent artifact download \"docker/*\" binaries --step \"build via docker\"\n- buildkite-agent artifact download \"docker/*\" arm-binaries --step \"build arm via docker\"\n- ls binaries\n- - GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\n+ - ./scripts/autorelease.sh\nbranches: master\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fetch token from vault
Problem: Buildkite agent was moved to another server and the file with
token now isn't presented in the filesystem.
Solution: Don't rely on file and fetch token directly from vault.
|
603,652
|
18.11.2020 16:05:32
| -10,800
|
33ff4bae7879ac32e97819aeda08c90fe6b9ef9b
|
Fix source version reference in the release notes
Problem: Release notes were pointing to an invalid reference.
Solution: Fix it by removin 'refs/tags/' part.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -15,6 +15,6 @@ let\nlicenseFile = \"${source}/LICENSE\";\n} // meta;\nrelease = pkgs.callPackage ./release.nix\n- { binaries = docker-binaries; arm-binaries = docker-arm-binaries; inherit commonMeta; };\n+ { binaries = docker-binaries; arm-binaries = docker-arm-binaries; inherit commonMeta; inherit (pkgs.lib) replaceStrings; };\nin { inherit release commonMeta pkgs; }\n"
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ writeTextDir, runCommand, buildEnv, binaries, arm-binaries, commonMeta }:\n+{ writeTextDir, runCommand, buildEnv, binaries, arm-binaries, commonMeta, replaceStrings }:\nlet\nrelease-binaries = import ./nix/build/release-binaries.nix;\n+ version = replaceStrings [\"refs/tags/\"] [\"\"] commonMeta.branchName;\nrelease-notes = writeTextDir \"release-notes.md\" ''\nAutomatic release\n- This release contains assets based on [${commonMeta.branchName} release](https://gitlab.com/tezos/tezos/tree/${commonMeta.branchName}).\n+ This release contains assets based on [${version} release](https://gitlab.com/tezos/tezos/tree/${version}).\nBinaries that target arm64 architecture has `-arm64` suffix in the name.\nOther binaries target x86_64.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix source version reference in the release notes
Problem: Release notes were pointing to an invalid reference.
Solution: Fix it by removin 'refs/tags/' part.
|
603,652
|
18.11.2020 16:06:25
| -10,800
|
71267dbea95fac5d4fee5f69a64bac2eb8b679f7
|
Pin auto-release title
|
[
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "@@ -7,8 +7,6 @@ let\nrelease-binaries = import ./nix/build/release-binaries.nix;\nversion = replaceStrings [\"refs/tags/\"] [\"\"] commonMeta.branchName;\nrelease-notes = writeTextDir \"release-notes.md\" ''\n- Automatic release\n-\nThis release contains assets based on [${version} release](https://gitlab.com/tezos/tezos/tree/${version}).\nBinaries that target arm64 architecture has `-arm64` suffix in the name.\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -35,7 +35,7 @@ git tag -f auto-release\ngit push --force --tags\n# Create release\n-gh release create -F \"$TEMPDIR\"/\"$project\"/release-notes.md --prerelease auto-release\n+gh release create -F \"$TEMPDIR\"/\"$project\"/release-notes.md --prerelease auto-release --title auto-release\n# Upload assets\ngh release upload auto-release \"$assets_dir\"/*\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Pin auto-release title
|
603,652
|
12.11.2020 15:57:29
| -10,800
|
9747947ac142e5675c9ea228f1ee920aa3fbeb95
|
Fix package build dependencies
Apparently, they were lost during some rebase:(
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -47,8 +47,9 @@ fedora_epoch = 1\npwd = os.getcwd()\nhome = os.environ[\"HOME\"]\n+\ndef gen_control_file(pkg: Package, out):\n- str_build_deps = \", \".join(build_deps)\n+ str_build_deps = \", \".join(common_deps)\nfile_contents = f'''\nSource: {pkg.name.lower()}\nSection: utils\n@@ -66,8 +67,9 @@ Description: {pkg.desc}\nwith open(out, 'w') as f:\nf.write(file_contents)\n+\ndef gen_spec_file(pkg: Package, out):\n- build_requires = \" \".join(build_deps + run_deps)\n+ build_requires = \" \".join(common_deps)\nconfig_files = list(filter(lambda x: x is not None, map(lambda x: x.config_file, package.systemd_units)))\nrequires = \" \".join(run_deps)\nif len(pkg.systemd_units) > 0:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix package build dependencies
Apparently, they were lost during some rebase:(
|
603,652
|
12.11.2020 15:58:38
| -10,800
|
59a49a071773b36dcf5e222cef068a1e67170516
|
Add systemd units for tezos-signer
Problem: tezos-signer can be run as a signing daemon in one of four
modes.
Solution: Add services for each signer daemon mode: over TCP socket,
over Unix socket, over HTTP, and over HTTPS.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/defaults/tezos-signer.conf",
"diff": "+# vim: ft=sh\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+# shellcheck disable=SC2034\n+DATA_DIR=\"/var/lib/tezos/signer\"\n+PIDFILE=\"\"\n+MAGIC_BYTES=\"\"\n+CHECK_HIGH_WATERMARK=\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -7,7 +7,7 @@ from typing import List\n# There are more possible fields, but only these are used by tezos services\nclass Service:\ndef __init__(self, exec_start: str, state_directory:str, user: str,\n- environment_file: str=None, environment: List[str]=[],):\n+ environment_file: str=None, environment: List[str]=[]):\nself.environment_file = environment_file\nself.environment = environment\nself.exec_start = exec_start\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -200,6 +200,7 @@ def gen_rules(pkg: Package, out):\nfor systemd_unit in pkg.systemd_units:\nif systemd_unit.suffix is not None:\noverride_dh_install_init += f\" dh_installinit --name={pkg.name}-{systemd_unit.suffix}\\n\"\n+ override_dh_install_init += \" dh_installinit --noscripts\\n\"\nrules_contents = f'''#!/usr/bin/make -f\n%:\n@@ -233,7 +234,7 @@ for package in packages:\nos.rename(f\"{opam_package}-bundle\", dir)\n# subprocess.run([\"mkdir\", dir])\ngen_makefile(package, f\"{dir}/Makefile\")\n- config_files = list(filter(lambda x: x is not None, map(lambda x: x.config_file, package.systemd_units)))\n+ config_files = list(set(filter(lambda x: x is not None, map(lambda x: x.config_file, package.systemd_units))))\nif len(config_files) > 1:\nraise Exception(\"Packages cannot have more than one default config file for package\")\nif not is_ubuntu:\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -7,6 +7,53 @@ from .model import Service, ServiceFile, SystemdUnit, Unit, Package\nnetworks = [\"mainnet\", \"delphinet\"]\n+signer_units = [\n+ SystemdUnit(\n+ ServiceFile(Unit(after=[\"network.target\"],\n+ description=\"Tezos signer daemon running over TCP socket\"),\n+ Service(environment_file=\"/etc/default/tezos-signer\",\n+ environment=[\"ADDRESS=127.0.0.1\", \"PORT=8000\", \"TIMEOUT=1\"],\n+ exec_start=\"/usr/bin/tezos-signer-start launch socket signer \" \\\n+ + \" --address ${ADDRESS} --port ${PORT} --timeout ${TIMEOUT}\",\n+ state_directory=\"tezos\", user=\"tezos\")),\n+ suffix=\"tcp\",\n+ startup_script=\"tezos-signer-start\",\n+ config_file=\"tezos-signer.conf\"),\n+ SystemdUnit(\n+ ServiceFile(Unit(after=[\"network.target\"],\n+ description=\"Tezos signer daemon running over UNIX socket\"),\n+ Service(environment_file=\"/etc/default/tezos-signer\",\n+ environment=[\"SOCKET=\"],\n+ exec_start=\"/usr/bin/tezos-signer-start launch local signer \" \\\n+ + \"--socket ${SOCKET}\",\n+ state_directory=\"tezos\", user=\"tezos\")),\n+ suffix=\"unix\",\n+ startup_script=\"tezos-signer-start\",\n+ config_file=\"tezos-signer.conf\"),\n+ SystemdUnit(\n+ ServiceFile(Unit(after=[\"network.target\"],\n+ description=\"Tezos signer daemon running over HTTP\"),\n+ Service(environment_file=\"/etc/default/tezos-signer\",\n+ environment=[\"CERT_PATH=\", \"KEY_PATH=\", \"ADDRESS=127.0.0.1\", \"PORT=8080\"],\n+ exec_start=\"/usr/bin/tezos-signer-start launch http signer \" \\\n+ + \"--address ${ADDRESS} --port ${PORT}\",\n+ state_directory=\"tezos\", user=\"tezos\")),\n+ suffix=\"http\",\n+ startup_script=\"tezos-signer-start\",\n+ config_file=\"tezos-signer.conf\"),\n+ SystemdUnit(\n+ ServiceFile(Unit(after=[\"network.target\"],\n+ description=\"Tezos signer daemon running over HTTPs\"),\n+ Service(environment_file=\"/etc/default/tezos-signer\",\n+ environment=[\"CERT_PATH=\", \"KEY_PATH=\", \"ADDRESS=127.0.0.1\", \"PORT=8080\"],\n+ exec_start=\"/usr/bin/tezos-signer-start launch https signer \" \\\n+ + \"${CERT_PATH} ${KEY_PATH} --address ${ADDRESS} --port ${PORT}\",\n+ state_directory=\"tezos\", user=\"tezos\")),\n+ suffix=\"https\",\n+ startup_script=\"tezos-signer-start\",\n+ config_file=\"tezos-signer.conf\")\n+]\n+\npackages = [\nPackage(\"tezos-client\",\n\"CLI client for interacting with tezos blockchain\",\n@@ -16,7 +63,8 @@ packages = [\noptional_opam_deps=[\"tls\"]),\nPackage(\"tezos-signer\",\n\"A client to remotely sign operations or blocks\",\n- optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]),\n+ optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"],\n+ systemd_units=signer_units),\nPackage(\"tezos-codec\",\n\"A client to decode and encode JSON\")\n]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/scripts/tezos-signer-start",
"diff": "+#!/usr/bin/bash\n+\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+set -euo pipefail\n+\n+# $PROTOCOL should be defined in the system unit environment\n+signer=\"/usr/bin/tezos-signer\"\n+\n+if [[ -n $PIDFILE ]]; then\n+ pid_file_args=(\"--pid-file\" \"$PIDFILE\")\n+else\n+ pid_file_args=()\n+fi\n+\n+if [[ -n $MAGIC_BYTES ]]; then\n+ magic_bytes_args=(\"--magic-bytes\" \"$MAGIC_BYTES\")\n+else\n+ magic_bytes_args=()\n+fi\n+\n+if [[ -n $CHECK_HIGH_WATERMARK ]]; then\n+ check_high_watermark_args=(\"--check-high-watermark\")\n+else\n+ check_high_watermark_args=()\n+fi\n+\n+\"$signer\" -d \"$DATA_DIR\" \"${pid_file_args[@]}\" \"${magic_bytes_args[@]}\" \\\n+ \"${check_high_watermark_args[@]}\" \"$@\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#100] Add systemd units for tezos-signer
Problem: tezos-signer can be run as a signing daemon in one of four
modes.
Solution: Add services for each signer daemon mode: over TCP socket,
over Unix socket, over HTTP, and over HTTPS.
|
603,652
|
19.11.2020 12:05:17
| -10,800
|
db74b738ed6199d62cce1fe952c835421ff45943
|
Use dedicated default configs for services
Problem: There are four services for tezos-signer, which rely
on the same default config file, however, it's possible for them
to use different config at the same time.
Solution: Make it possible to have multiple default configs:
one per systemd unit in package.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -80,12 +80,11 @@ def gen_spec_file(pkg: Package, out):\nsystemd_units_post = \"\"\nsystemd_units_preun = \"\"\nsystemd_units_postun = \"\"\n- if len(config_files) == 1:\n- install_default = f'''\n-mkdir -p %{{buildroot}}/%{{_sysconfdir}}/default\n-install -m 644 %{{name}}.default %{{buildroot}}/%{{_sysconfdir}}/default/%{{name}}'''\n+ if len(config_files) > 0:\n+ install_default = f\"mkdir -p %{{buildroot}}/%{{_sysconfdir}}/default\\n\"\nelse:\ninstall_default = \"\"\n+ default_files = \"\"\nfor systemd_unit in pkg.systemd_units:\nif systemd_unit.suffix is None:\ninstall_unit_files += f\"install -m 644 %{{name}}.service %{{buildroot}}/%{{_unitdir}}\\n\"\n@@ -94,6 +93,10 @@ install -m 644 %{{name}}.default %{{buildroot}}/%{{_sysconfdir}}/default/%{{name\nsystemd_units_post += f\"%systemd_post %{{name}}.service\\n\"\nsystemd_units_preun += f\"%systemd_preun %{{name}}.service\\n\"\nsystemd_units_postun += f\"%systemd_postun_with_restart %{{name}}.service\\n\"\n+ if systemd_unit.config_file is not None:\n+ install_default += f\"install -m 644 %{{name}}.default \" + \\\n+ f\"%{{buildroot}}/%{{_sysconfdir}}/default/%{{name}}\\n\"\n+ default_files += f\"%{{_sysconfdir}}/default/%{{name}}\\n\"\nelse:\ninstall_unit_files += f\"install -m 644 %{{name}}-{systemd_unit.suffix}.service %{{buildroot}}/%{{_unitdir}}\\n\"\nsystemd_unit_files += f\"%{{_unitdir}}/%{{name}}-{systemd_unit.suffix}.service\\n\"\n@@ -101,6 +104,10 @@ install -m 644 %{{name}}.default %{{buildroot}}/%{{_sysconfdir}}/default/%{{name\nsystemd_units_post += f\"%systemd_post %{{name}}-{systemd_unit.suffix}.service\\n\"\nsystemd_units_preun += f\"%systemd_preun %{{name}}-{systemd_unit.suffix}.service\\n\"\nsystemd_units_postun += f\"%systemd_postun_with_restart %{{name}}-{systemd_unit.suffix}.service\\n\"\n+ if systemd_unit.config_file is not None:\n+ install_default += f\"install -m 644 %{{name}}-{systemd_unit.suffix}.default \" + \\\n+ f\"%{{buildroot}}/%{{_sysconfdir}}/default/%{{name}}-{systemd_unit.suffix}\\n\"\n+ default_files += f\"%{{_sysconfdir}}/default/%{{name}}-{systemd_unit.suffix}\\n\"\ninstall_startup_scripts = \"\"\nsystemd_startup_files = \"\"\nfor startup_script in startup_scripts:\n@@ -116,7 +123,7 @@ mkdir -p %{{buildroot}}/%{{_unitdir}}\nsystemd_files = f'''\n{systemd_startup_files}\n{systemd_unit_files}\n-{ f\"%{{_sysconfdir}}/default/%{{name}}\" if len(config_files) == 1 else \"\" }\n+{default_files}\n'''\nsystemd_macros= f'''\n%post\n@@ -200,7 +207,6 @@ def gen_rules(pkg: Package, out):\nfor systemd_unit in pkg.systemd_units:\nif systemd_unit.suffix is not None:\noverride_dh_install_init += f\" dh_installinit --name={pkg.name}-{systemd_unit.suffix}\\n\"\n- override_dh_install_init += \" dh_installinit --noscripts\\n\"\nrules_contents = f'''#!/usr/bin/make -f\n%:\n@@ -232,26 +238,26 @@ for package in packages:\n[\"--ocaml=4.09.1\", \"--yes\", \"--opam=2.0.5\"], check=True)\nsubprocess.run([\"tar\", \"-zxf\", f\"{opam_package}-bundle.tar.gz\"], check=True)\nos.rename(f\"{opam_package}-bundle\", dir)\n- # subprocess.run([\"mkdir\", dir])\ngen_makefile(package, f\"{dir}/Makefile\")\n- config_files = list(set(filter(lambda x: x is not None, map(lambda x: x.config_file, package.systemd_units))))\n- if len(config_files) > 1:\n- raise Exception(\"Packages cannot have more than one default config file for package\")\nif not is_ubuntu:\nsubprocess.run([\"wget\", \"-q\", \"-O\", f\"{dir}/LICENSE\", f\"https://gitlab.com/tezos/tezos/-/raw/v{version}/LICENSE\"], check=True)\nif is_ubuntu:\nsubprocess.run([\"tar\", \"-czf\", f\"{dir}.tar.gz\", dir], check=True)\nos.chdir(dir)\nsubprocess.run([\"dh_make\", \"-syf\" f\"../{dir}.tar.gz\"], check=True)\n- if len(config_files) == 1:\n- shutil.copy(f\"{os.path.dirname(__file__)}/defaults/{config_files[0]}\", f\"debian/{package.name.lower()}.default\")\nfor systemd_unit in package.systemd_units:\nif systemd_unit.service_file.service.environment_file is not None:\nsystemd_unit.service_file.service.environment_file = systemd_unit.service_file.service.environment_file.lower()\nif systemd_unit.suffix is None:\n+ if systemd_unit.config_file is not None:\n+ shutil.copy(f\"{os.path.dirname(__file__)}/defaults/{systemd_unit.config_file}\",\n+ f\"debian/{package.name.lower()}.default\")\nprint_service_file(systemd_unit.service_file, f\"debian/{package.name.lower()}.service\")\nelse:\nprint_service_file(systemd_unit.service_file, f\"debian/{package.name.lower()}-{systemd_unit.suffix}.service\")\n+ if systemd_unit.config_file is not None:\n+ shutil.copy(f\"{os.path.dirname(__file__)}/defaults/{systemd_unit.config_file}\",\n+ f\"debian/{package.name.lower()}-{systemd_unit.suffix}.default\")\nshutil.copy(f\"{os.path.dirname(__file__)}/scripts/{systemd_unit.startup_script}\", f\"debian/{systemd_unit.startup_script}\")\ngen_install(package, \"debian/install\")\ngen_control_file(package, \"debian/control\")\n@@ -266,11 +272,15 @@ for package in packages:\nfor systemd_unit in package.systemd_units:\nif systemd_unit.suffix is None:\nprint_service_file(systemd_unit.service_file, f\"{dir}/{package.name}.service\")\n+ if systemd_unit.config_file is not None:\n+ shutil.copy(f\"{os.path.dirname(__file__)}/defaults/{systemd_unit.config_file}\",\n+ f\"{dir}/{package.name}.default\")\nelse:\nprint_service_file(systemd_unit.service_file, f\"{dir}/{package.name}-{systemd_unit.suffix}.service\")\n+ if systemd_unit.config_file is not None:\n+ shutil.copy(f\"{os.path.dirname(__file__)}/defaults/{systemd_unit.config_file}\",\n+ f\"{dir}/{package.name}-{systemd_unit.suffix}.default\")\nshutil.copy(f\"{os.path.dirname(__file__)}/scripts/{systemd_unit.startup_script}\", f\"{dir}/{systemd_unit.startup_script}\")\n- if len(config_files) == 1:\n- shutil.copy(f\"{os.path.dirname(__file__)}/defaults/{config_files[0]}\", f\"{dir}/{package.name}.default\")\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/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -11,7 +11,7 @@ signer_units = [\nSystemdUnit(\nServiceFile(Unit(after=[\"network.target\"],\ndescription=\"Tezos signer daemon running over TCP socket\"),\n- Service(environment_file=\"/etc/default/tezos-signer\",\n+ Service(environment_file=\"/etc/default/tezos-signer-tcp\",\nenvironment=[\"ADDRESS=127.0.0.1\", \"PORT=8000\", \"TIMEOUT=1\"],\nexec_start=\"/usr/bin/tezos-signer-start launch socket signer \" \\\n+ \" --address ${ADDRESS} --port ${PORT} --timeout ${TIMEOUT}\",\n@@ -22,7 +22,7 @@ signer_units = [\nSystemdUnit(\nServiceFile(Unit(after=[\"network.target\"],\ndescription=\"Tezos signer daemon running over UNIX socket\"),\n- Service(environment_file=\"/etc/default/tezos-signer\",\n+ Service(environment_file=\"/etc/default/tezos-signer-unix\",\nenvironment=[\"SOCKET=\"],\nexec_start=\"/usr/bin/tezos-signer-start launch local signer \" \\\n+ \"--socket ${SOCKET}\",\n@@ -33,7 +33,7 @@ signer_units = [\nSystemdUnit(\nServiceFile(Unit(after=[\"network.target\"],\ndescription=\"Tezos signer daemon running over HTTP\"),\n- Service(environment_file=\"/etc/default/tezos-signer\",\n+ Service(environment_file=\"/etc/default/tezos-signer-http\",\nenvironment=[\"CERT_PATH=\", \"KEY_PATH=\", \"ADDRESS=127.0.0.1\", \"PORT=8080\"],\nexec_start=\"/usr/bin/tezos-signer-start launch http signer \" \\\n+ \"--address ${ADDRESS} --port ${PORT}\",\n@@ -44,7 +44,7 @@ signer_units = [\nSystemdUnit(\nServiceFile(Unit(after=[\"network.target\"],\ndescription=\"Tezos signer daemon running over HTTPs\"),\n- Service(environment_file=\"/etc/default/tezos-signer\",\n+ Service(environment_file=\"/etc/default/tezos-signer-https\",\nenvironment=[\"CERT_PATH=\", \"KEY_PATH=\", \"ADDRESS=127.0.0.1\", \"PORT=8080\"],\nexec_start=\"/usr/bin/tezos-signer-start launch https signer \" \\\n+ \"${CERT_PATH} ${KEY_PATH} --address ${ADDRESS} --port ${PORT}\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#100] Use dedicated default configs for services
Problem: There are four services for tezos-signer, which rely
on the same default config file, however, it's possible for them
to use different config at the same time.
Solution: Make it possible to have multiple default configs:
one per systemd unit in package.
|
603,652
|
25.11.2020 16:48:39
| -10,800
|
66146d289f61cea7f77a19d7ea8849103f028376
|
Strip tezos-sandbox from nix part
Problem: tezos-sandbox isn't an opam package, thus it's quite
nontrivial to build it using opam-nix.
Solution: Strip it from the nix part for now.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/release-binaries.nix",
"new_path": "nix/build/release-binaries.nix",
"diff": "@@ -33,6 +33,11 @@ in [\ndescription = \"A client to decode and encode JSON\";\nsupports = protocolsFormatted;\n}\n+ {\n+ name = \"tezos-sandbox\";\n+ description = \"A tool for setting up and running testing scenarios with the local blockchain\";\n+ supports = protocolsFormatted;\n+ }\n] ++ builtins.concatMap (protocol: [\n{\nname = \"tezos-baker-${protocol}\";\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/static-overlay.nix",
"new_path": "nix/build/static-overlay.nix",
"diff": "@@ -31,5 +31,5 @@ in {\nbuiltins.listToAttrs (map ({ name, ... }: {\ninherit name;\nvalue = makeStaticDefaults osuper.${name};\n- }) release-binaries));\n+ }) (builtins.filter (elem: elem.name != \"tezos-sandbox\") release-binaries)));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -8,7 +8,8 @@ let\nsource = (import ./nix/sources.nix).tezos;\nprotocols = import ./protocols.nix;\nbin = pkgs.callPackage ./build/bin.nix { };\n- release-binaries = import ./build/release-binaries.nix;\n+ release-binaries = builtins.filter (elem: elem.name != \"tezos-sandbox\")\n+ (import ./build/release-binaries.nix);\nbinaries = builtins.listToAttrs (map (meta: {\ninherit (meta) name;\nvalue = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; };\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#109] Strip tezos-sandbox from nix part
Problem: tezos-sandbox isn't an opam package, thus it's quite
nontrivial to build it using opam-nix.
Solution: Strip it from the nix part for now.
|
603,652
|
19.11.2020 18:39:17
| -10,800
|
e5cba63d1f83b6436ada21516186c223818d7073
|
Add proper argument parser for package gen
Problem: We're going to add one more option for path to sources archive
and it will be a bit messy to have that much positional arguments
Solution: Add proper option parser using getopt.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -66,7 +66,7 @@ steps:\n- label: test deb source packages via docker\ncommands:\n- eval \"$SET_VERSION\"\n- - ./docker/docker-tezos-packages.sh ubuntu source\n+ - ./docker/docker-tezos-packages.sh --os ubuntu --type source\nartifact_paths:\n- ./out/*\nbranches: \"!master\"\n@@ -78,7 +78,7 @@ steps:\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 ubuntu binary tezos-baker-007-PsDELPH1\n+ - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-007-PsDELPH1\n- rm -rf out\nbranches: \"!master\"\ntimeout_in_minutes: 30\n@@ -87,7 +87,7 @@ steps:\n- label: test rpm source packages via docker\ncommands:\n- eval \"$SET_VERSION\"\n- - ./docker/docker-tezos-packages.sh fedora source\n+ - ./docker/docker-tezos-packages.sh --os fedora --type source\nartifact_paths:\n- ./out/*\nbranches: \"!master\"\n@@ -99,7 +99,7 @@ steps:\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 fedora binary tezos-baker-007-PsDELPH1\n+ - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-007-PsDELPH1\n- rm -rf out\nbranches: \"!master\"\ntimeout_in_minutes: 30\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/docker-tezos-packages.sh",
"new_path": "docker/docker-tezos-packages.sh",
"diff": "@@ -16,11 +16,29 @@ else\nvirtualisation_engine=\"docker\"\nfi\n-target_os=\"${1-}\"\n+args=()\n+\n+while true;\n+do\n+ arg=\"${1-}\"\n+ if [[ -z \"$arg\" ]];\n+ then\n+ break\n+ fi\n+ case $arg in\n+ --os )\n+ target_os=\"$2\"\n+ shift 2\n+ ;;\n+ * )\n+ args+=(\"$arg\")\n+ shift\n+ esac\n+done\n\"$virtualisation_engine\" build -t tezos-\"$target_os\" -f docker/package/Dockerfile-\"$target_os\" .\nset +e\n-container_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=120 -t tezos-\"$target_os\" \"$@\")\"\n+container_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=120 -t tezos-\"$target_os\" \"${args[@]}\")\"\n\"$virtualisation_engine\" start -a \"$container_id\"\nexit_code=\"$?\"\n\"$virtualisation_engine\" cp \"$container_id\":/tezos-packaging/docker/out .\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-import os, shutil, sys, subprocess, json\n+import os, shutil, sys, subprocess, json, argparse\nfrom distutils.dir_util import copy_tree\nfrom .model import Package, print_service_file\nfrom .packages import packages\n-if sys.argv[1] == \"ubuntu\":\n+is_ubuntu = None\n+is_source = None\n+package_to_build = None\n+\n+parser = argparse.ArgumentParser()\n+parser.add_argument(\"--os\", required=True)\n+parser.add_argument(\"--type\", help=\"package type\", required=True)\n+parser.add_argument(\"--package\", help=\"specify binary to package\")\n+args = parser.parse_args()\n+\n+if args.os == \"ubuntu\":\nis_ubuntu = True\n-elif sys.argv[1] == \"fedora\":\n+elif args.os == \"fedora\":\nis_ubuntu = False\nelse:\n- raise Exception(f\"Unexpected package target OS, only 'ubuntu' and 'fedora' are supported.\")\n+ raise Exception(\"Unexpected package target OS, only 'ubuntu' and 'fedora' are supported.\")\n-if sys.argv[2] == \"source\":\n+if args.type == \"source\":\nis_source = True\n-elif sys.argv[2] == \"binary\":\n+elif args.type == \"binary\":\nis_source = False\nelse:\nraise Exception(\"Unexpected package format, only 'source' and 'binary' are supported.\")\n-package_to_build = None\n-if len(sys.argv) == 4:\n- package_to_build = sys.argv[3]\n+package_to_build = args.package\ndate = subprocess.check_output([\"date\", \"-R\"]).decode().strip()\nmeta = json.load(open(f\"{os.path.dirname(__file__)}/../../meta.json\", \"r\"))\n@@ -265,6 +273,7 @@ for package in packages:\nsubprocess.run(\"rm debian/*.ex debian/*.EX debian/README*\", shell=True, check=True)\ngen_changelog(package, \"bionic\", meta[\"maintainer\"], date, \"debian/changelog\")\ngen_rules(package, \"debian/rules\")\n+ subprocess.run([\"ls\"])\nsubprocess.run([\"dpkg-buildpackage\", \"-S\" if is_source else \"-b\", \"-us\", \"-uc\"],\ncheck=True)\nos.chdir(\"..\")\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#118] Add proper argument parser for package gen
Problem: We're going to add one more option for path to sources archive
and it will be a bit messy to have that much positional arguments
Solution: Add proper option parser using getopt.
|
603,652
|
20.11.2020 16:51:49
| -10,800
|
c5daaabbe3bc6f4a760776092358670b6d535f3e
|
Allow using existing source archive
Problem: Launchpad requires the source archive to be the same for
the same package version.
Solution: Allow using existing source archive when building ubuntu
packages.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/docker-tezos-packages.sh",
"new_path": "docker/docker-tezos-packages.sh",
"diff": "@@ -27,18 +27,31 @@ do\nfi\ncase $arg in\n--os )\n+ args+=(\"$arg\" \"$2\")\ntarget_os=\"$2\"\nshift 2\n;;\n+ --sources )\n+ source_archive=\"$2\"\n+ source_archive_name=\"$(basename \"$2\")\"\n+ args+=(\"$arg\" \"$source_archive_name\")\n+ shift 2\n+ ;;\n* )\nargs+=(\"$arg\")\nshift\n+ ;;\nesac\ndone\n\"$virtualisation_engine\" build -t tezos-\"$target_os\" -f docker/package/Dockerfile-\"$target_os\" .\nset +e\n+if [[ -z ${source_archive-} ]]; then\ncontainer_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=120 -t tezos-\"$target_os\" \"${args[@]}\")\"\n+else\n+ container_id=\"$(\"$virtualisation_engine\" create -v \"$PWD/$source_archive:/tezos-packaging/docker/$source_archive_name\" \\\n+ --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=120 -t tezos-\"$target_os\" \"${args[@]}\")\"\n+fi\n\"$virtualisation_engine\" start -a \"$container_id\"\nexit_code=\"$?\"\n\"$virtualisation_engine\" cp \"$container_id\":/tezos-packaging/docker/out .\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -11,11 +11,13 @@ from .packages import packages\nis_ubuntu = None\nis_source = None\npackage_to_build = None\n+source_archive = None\nparser = argparse.ArgumentParser()\nparser.add_argument(\"--os\", required=True)\nparser.add_argument(\"--type\", help=\"package type\", required=True)\nparser.add_argument(\"--package\", help=\"specify binary to package\")\n+parser.add_argument(\"--sources\", help=\"specify source archive for single ubuntu package\")\nargs = parser.parse_args()\nif args.os == \"ubuntu\":\n@@ -33,6 +35,7 @@ else:\nraise Exception(\"Unexpected package format, only 'source' and 'binary' are supported.\")\npackage_to_build = args.package\n+source_archive = args.sources\ndate = subprocess.check_output([\"date\", \"-R\"]).decode().strip()\nmeta = json.load(open(f\"{os.path.dirname(__file__)}/../../meta.json\", \"r\"))\n@@ -239,8 +242,7 @@ for package in packages:\ndir = f\"{package.name.lower()}-{version}\"\nelse:\ndir = f\"{package.name}-{version}\"\n- # tezos-client and tezos-admin-client are in one opam package\n-\n+ if source_archive is None:\nopam_package = \"tezos-client\" if package.name == \"tezos-admin-client\" else package.name\nsubprocess.run([\"opam\", \"exec\", \"--\", \"opam-bundle\", f\"{opam_package}={version}\"] + package.optional_opam_deps +\n[\"--ocaml=4.09.1\", \"--yes\", \"--opam=2.0.5\"], check=True)\n@@ -250,7 +252,11 @@ for package in packages:\nif not is_ubuntu:\nsubprocess.run([\"wget\", \"-q\", \"-O\", f\"{dir}/LICENSE\", f\"https://gitlab.com/tezos/tezos/-/raw/v{version}/LICENSE\"], check=True)\nif is_ubuntu:\n+ if source_archive is None:\nsubprocess.run([\"tar\", \"-czf\", f\"{dir}.tar.gz\", dir], check=True)\n+ else:\n+ shutil.copy(f\"{os.path.dirname(__file__)}/../{source_archive}\", f\"{dir}.tar.gz\")\n+ subprocess.run([\"tar\", \"-xzf\", f\"{dir}.tar.gz\"], check=True)\nos.chdir(dir)\nsubprocess.run([\"dh_make\", \"-syf\" f\"../{dir}.tar.gz\"], check=True)\nfor systemd_unit in package.systemd_units:\n@@ -273,11 +279,12 @@ for package in packages:\nsubprocess.run(\"rm debian/*.ex debian/*.EX debian/README*\", shell=True, check=True)\ngen_changelog(package, \"bionic\", meta[\"maintainer\"], date, \"debian/changelog\")\ngen_rules(package, \"debian/rules\")\n- subprocess.run([\"ls\"])\nsubprocess.run([\"dpkg-buildpackage\", \"-S\" if is_source else \"-b\", \"-us\", \"-uc\"],\ncheck=True)\nos.chdir(\"..\")\nelse:\n+ if source_archive is not None:\n+ raise Exception(\"Sources archive provision isn't supported for Fedora packages\")\nfor systemd_unit in package.systemd_units:\nif systemd_unit.suffix is None:\nprint_service_file(systemd_unit.service_file, f\"{dir}/{package.name}.service\")\n@@ -318,4 +325,4 @@ else:\nfor f in os.listdir(artifacts_dir):\nfor ext in exts:\nif f.endswith(ext):\n- os.rename(f\"{artifacts_dir}/{f}\", os.path.join(\"out\", f))\n+ shutil.copy(f\"{artifacts_dir}/{f}\", os.path.join(\"out\", f))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#118] Allow using existing source archive
Problem: Launchpad requires the source archive to be the same for
the same package version.
Solution: Allow using existing source archive when building ubuntu
packages.
|
603,652
|
25.11.2020 11:20:01
| -10,800
|
a687f50053292c4f0ce092c04a7d513686a1e350
|
Calculate sha256sum for release assets
And include .sha256 files to the assets as well
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -22,6 +22,9 @@ assets_dir=$TEMPDIR/assets\nnix-build -A release -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" \\\n--arg docker-binaries ./binaries/docker --arg docker-arm-binaries ./arm-binaries/docker\nmkdir -p \"$assets_dir\"\n+for asset in \"$assets_dir\"/*; do\n+ sha256sum \"$asset\" > \"$asset.sha256\"\n+done\n# Move archive with binaries and tezos license to assets\nshopt -s extglob\ncp -L \"$TEMPDIR\"/\"$project\"/!(*.md) \"$assets_dir\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#114] Calculate sha256sum for release assets
And include .sha256 files to the assets as well
|
603,652
|
25.11.2020 12:24:52
| -10,800
|
09406b1834f6c107bf2311c836b7b6c5b2859e41
|
Add note about Fedora packages signing
Problem: We're already signing Ubuntu packages because it's mandatory,
however, we're not signing Fedora packages.
Solution: Mention in README that one should sign source packages before
publishing them on Copr.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/README.md",
"new_path": "docker/README.md",
"diff": "@@ -181,4 +181,10 @@ cd .. && ./docker/docker-tezos-packages.sh --os fedora --type source\ncd .. && ./docker/docker-tezos-packages.sh --os fedora --type source --package tezos-baker-007-PsDELPH1\n```\n+Sign source packages:\n+```\n+rpm --add-sign out/*.src.rpm\n+```\n+Note, that in order to sign them, you'll need gpg key to be set up in `~/.rpmmacros`.\n+\nResulting `.src.rpm` packages can be either built locally or submitted to the Copr.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#114] Add note about Fedora packages signing
Problem: We're already signing Ubuntu packages because it's mandatory,
however, we're not signing Fedora packages.
Solution: Mention in README that one should sign source packages before
publishing them on Copr.
|
603,652
|
26.11.2020 20:09:22
| -10,800
|
cba3faf54dae3d783780f5244a0d4f496225896a
|
Sign artifacts with PGP key
Problem: We want to provide some proof that our artifacts can be
trusted.
Solution: Sign them with PGP key and provide public key, so that
users can check that signature is valid.
|
[
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "@@ -12,6 +12,9 @@ let\nBinaries that target arm64 architecture has `-arm64` suffix in the name.\nOther binaries target x86_64.\n+ Release artifacts are signed with the following key: 0x7EAF9B150ACE940CF8C008A0BF847A85AC7BF43E.\n+ You can check it on http://keys.gnupg.net/.\n+\nDescriptions for binaries included in this release:\n${builtins.concatStringsSep \"\\n\"\n(map ({ name, description, ... }: \"- `${name}`: ${description}\")\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -22,12 +22,15 @@ assets_dir=$TEMPDIR/assets\nnix-build -A release -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" \\\n--arg docker-binaries ./binaries/docker --arg docker-arm-binaries ./arm-binaries/docker\nmkdir -p \"$assets_dir\"\n-for asset in \"$assets_dir\"/*; do\n- sha256sum \"$asset\" > \"$asset.sha256\"\n-done\n# Move archive with binaries and tezos license to assets\nshopt -s extglob\ncp -L \"$TEMPDIR\"/\"$project\"/!(*.md) \"$assets_dir\"\n+# Iterate over assets, calculate sha256sum and sign them in order\n+# to include this additional info to the release assets as well\n+for asset in $assets_dir/*; do\n+ sha256sum \"$asset\" | sed 's/ .*/ /' > \"$asset.sha256\"\n+ gpg --armor --detach-sign \"$asset\"\n+done\n# Delete release if it exists\ngh release delete auto-release --yes || true\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shell.nix",
"new_path": "scripts/shell.nix",
"diff": "@@ -25,5 +25,5 @@ in\n{ pkgs ? import (import ../nix/nix/sources.nix {}).nixpkgs { inherit overlays; } }:\nwith pkgs;\nmkShell {\n- buildInputs = [ gh git rename ];\n+ buildInputs = [ gh git rename gnupg ];\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#114] Sign artifacts with PGP key
Problem: We want to provide some proof that our artifacts can be
trusted.
Solution: Sign them with PGP key and provide public key, so that
users can check that signature is valid.
|
603,652
|
04.12.2020 15:06:07
| -10,800
|
970ea78dddff0302c182beff3ddd3a587784be05
|
Suspend native packaging
Problem: Our native packaging relies on tezos packages in opam
repository, which wasn't update to 7.5 yet. However, we should create
7.5 release at least with static binaries.
Solution: Susped native packaging in the CI for now.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -63,48 +63,49 @@ steps:\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\nbranches: \"!master\"\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: 30\n- agents:\n- queue: \"docker\"\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-007-PsDELPH1\n- - rm -rf out\n- branches: \"!master\"\n- timeout_in_minutes: 30\n- agents:\n- queue: \"docker\"\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: 30\n- agents:\n- queue: \"docker\"\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-007-PsDELPH1\n- - rm -rf out\n- branches: \"!master\"\n- timeout_in_minutes: 30\n- agents:\n- queue: \"docker\"\n+ # Native packaging is suspended for now, because opam-repository isn't updated\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: 30\n+ # agents:\n+ # queue: \"docker\"\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-007-PsDELPH1\n+ # - rm -rf out\n+ # branches: \"!master\"\n+ # timeout_in_minutes: 30\n+ # agents:\n+ # queue: \"docker\"\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: 30\n+ # agents:\n+ # queue: \"docker\"\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-007-PsDELPH1\n+ # - rm -rf out\n+ # branches: \"!master\"\n+ # timeout_in_minutes: 30\n+ # agents:\n+ # queue: \"docker\"\n- wait\n- label: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Suspend native packaging
Problem: Our native packaging relies on tezos packages in opam
repository, which wasn't update to 7.5 yet. However, we should create
7.5 release at least with static binaries.
Solution: Susped native packaging in the CI for now.
|
603,652
|
09.11.2020 15:06:11
| -10,800
|
64bf6f4e092bc5440cd464c71c8c26acc3cc79be
|
Bump tezos 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\": \"d67e70b40203a6a1c77ccb2edbe136c1509a73a3\",\n- \"sha256\": \"1yphw9xcss284p51qnml5jvfs4mhjcjgdka3wk25q0437zdzqj4n\",\n+ \"rev\": \"ca8560e5f86de88fe8d1a1050a1e125b55b587e7\",\n+ \"sha256\": \"18xxs1gadsc4a361mjv7pgjb43d2dn9z0ahk1c4pjpj6lajhbxw9\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/d67e70b40203a6a1c77ccb2edbe136c1509a73a3.tar.gz\",\n+ \"url\": \"https://github.com/ocaml/opam-repository/archive/ca8560e5f86de88fe8d1a1050a1e125b55b587e7.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"refs/tags/v7.5\",\n+ \"ref\": \"refs/tags/v8.0-rc2\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"ce36545683607b68d59e03ec6122a50a09909462\",\n+ \"rev\": \"c4907703d66e5f75d2da525a6b66a893f80d8093\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump tezos and opam repository
|
603,652
|
09.11.2020 15:16:04
| -10,800
|
0d78be8674ebf756d783fefe962281f9644d02a9
|
Adjust static patch
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "@@ -155,16 +155,6 @@ index 074b4e006..cf801b59c 100644\n(alias\n(name runtest_lint)\n-diff --git a/vendors/index/src/unix/dune b/vendors/index/src/unix/dune\n-index 49e819dd2..833a3f473 100644\n---- a/vendors/index/src/unix/dune\n-+++ b/vendors/index/src/unix/dune\n-@@ -2,4 +2,4 @@\n- (public_name index.unix)\n- (name index_unix)\n- (c_names fsync pread pwrite)\n-- (libraries fmt index logs logs.threaded threads.posix unix))\n-+ (libraries fmt index logs threads.posix unix))\ndiff --git a/src/bin_codec/dune b/src/bin_codec/dune\nindex ae32d5d2a..50a2cf09f 100644\n--- a/src/bin_codec/dune\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjust static patch
|
603,652
|
10.11.2020 11:56:05
| -10,800
|
9e6c756b63abf89a64cab354265ffaada08e987d
|
Update dependencies in docker images
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/Dockerfile",
"new_path": "docker/build/Dockerfile",
"diff": "@@ -5,7 +5,7 @@ FROM alpine:3.11\nRUN apk update\nRUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \\\nbubblewrap wget pkgconfig gmp-dev libev-dev hidapi-dev eudev-dev perl opam libusb-dev bash \\\n- autoconf automake libtool linux-headers\n+ autoconf automake libtool linux-headers cargo libffi-dev\nCOPY ./build/build-libusb-and-hidapi.sh /build-libusb-and-hidapi.sh\nRUN /build-libusb-and-hidapi.sh\nCOPY ./build/static_libs.patch /static.patch\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/build/Dockerfile.aarch64",
"new_path": "docker/build/Dockerfile.aarch64",
"diff": "@@ -11,7 +11,7 @@ COPY --from=binary-fetch qemu-aarch64-static /usr/bin/qemu-aarch64-static\nRUN apk update\nRUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \\\nbubblewrap wget pkgconfig gmp-dev libev-dev hidapi-dev eudev-dev perl opam libusb-dev bash \\\n- autoconf automake libtool linux-headers\n+ autoconf automake libtool linux-headers cargo libffi-dev\nCOPY ./build/build-libusb-and-hidapi.sh /build-libusb-and-hidapi.sh\nRUN /build-libusb-and-hidapi.sh\nCOPY ./build/static_libs.patch /static.patch\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update dependencies in docker images
|
603,652
|
10.11.2020 14:24:56
| -10,800
|
b0c22c02c36a65ab875b5f9c55ab5a8befcd2cf2
|
Use '--endpoint' in tests
Problem: '-A', '-P', '-S' options are now deprecated in favour of
'--endpoint'.
Solution: Use '--endpoint' in tests where needed.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -37,22 +37,22 @@ def run_node(network, use_tls):\n+ network\n+ \" &\"\n)\n- tls_flag = \" -S \" if use_tls else \" \"\n+ tls_endpoint = \" --endpoint https://localhost:8732/ \" if use_tls else \" \"\nmachine.wait_until_succeeds(\n- tezos_client + tls_flag + \"rpc get chains/main/blocks/head/\"\n+ tezos_client + tls_endpoint + \"rpc get chains/main/blocks/head/\"\n)\ndef run_node_with_daemons(network, use_tls):\nrun_node(network, use_tls)\n- tls_flag = \" -S \" if use_tls else \" \"\n+ tls_endpoint = \" --endpoint https://localhost:8732/ \" if use_tls else \" \"\nmachine.succeed(\nf\"{tezos_baker} -d client-dir\"\n- + tls_flag\n+ + tls_endpoint\n+ \"run with local node node-dir baker &\"\n)\n- machine.succeed(tezos_endorser + tls_flag + \"-d client-dir run baker &\")\n- machine.succeed(tezos_accuser + tls_flag + \"-d client-dir run &\")\n+ machine.succeed(tezos_endorser + tls_endpoint + \"-d client-dir run baker &\")\n+ machine.succeed(tezos_accuser + tls_endpoint + \"-d client-dir run &\")\ndef kill_node_with_daemons():\n@@ -63,9 +63,11 @@ def kill_node_with_daemons():\ndef test_node_with_daemons_scenario(network, use_tls=False):\n- tls_flag = \" -S \" if use_tls else \" \"\n+ tls_endpoint = \" --endpoint https://localhost:8732/ \" if use_tls else \" \"\nrun_node_with_daemons(network, use_tls)\n- machine.succeed(tezos_admin_client + tls_flag + \"rpc get chains/main/blocks/head/\")\n+ machine.succeed(\n+ tezos_admin_client + tls_endpoint + \"rpc get chains/main/blocks/head/\"\n+ )\nkill_node_with_daemons()\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Use '--endpoint' in tests
Problem: '-A', '-P', '-S' options are now deprecated in favour of
'--endpoint'.
Solution: Use '--endpoint' in tests where needed.
|
603,652
|
03.12.2020 14:05:19
| -10,800
|
86ee8ec704649880b777ac35b7ac6075fc1661cc
|
Update static_libs.patch
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\ndiff --git a/src/bin_client/dune b/src/bin_client/dune\n-index 28822fb9f..27c6b81ca 100644\n+index 862096adb..3c2dec974 100644\n--- a/src/bin_client/dune\n+++ b/src/bin_client/dune\n-@@ -74,7 +74,10 @@\n+@@ -74,7 +74,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++ -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 3249f6b22..d3266dddf 100644\n+--- a/src/bin_codec/dune\n++++ b/src/bin_codec/dune\n+@@ -30,7 +30,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(rule\n- (target void_for_linking)\n+ (action\ndiff --git a/src/bin_node/dune b/src/bin_node/dune\n-index 7ff6a869a..6ee10ed34 100644\n+index dbc503632..0ba0671a8 100644\n--- a/src/bin_node/dune\n+++ b/src/bin_node/dune\n-@@ -85,7 +85,9 @@\n+@@ -86,7 +86,8 @@\n-open Tezos_shell_context\n-open Tezos_workers\n-open Tezos_protocol_updater\n- -linkall)))\n+ -linkall\n-+ -ccopt -static\n-+ )))\n++ -ccopt -static)))\n(rule\n- (target void_for_linking)\n+ (action\ndiff --git a/src/bin_signer/dune b/src/bin_signer/dune\n-index a79e48830..2bafdc807 100644\n+index 2b8a8910f..847acd750 100644\n--- a/src/bin_signer/dune\n+++ b/src/bin_signer/dune\n-@@ -20,7 +20,10 @@\n+@@ -21,7 +21,9 @@\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-+ )))\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\n+index 48dcd6f3c..132a7bc4a 100644\n+--- a/src/bin_sandbox/dune\n++++ b/src/bin_sandbox/dune\n+@@ -1,7 +1,7 @@\n+ (executables\n+ (names main)\n+ (libraries flextesa)\n+- (flags :standard))\n++ (flags :standard -ccopt -static))\n- (alias\n- (name runtest_lint)\n+ (rule\n+ (alias runtest_sandbox_accusations_simple_double_baking)\ndiff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n-index 21b4bec58..9af9818fd 100644\n+index 7f2ec8a63..51ffdcc8b 100644\n--- a/src/lib_protocol_compiler/dune\n+++ b/src/lib_protocol_compiler/dune\n-@@ -65,7 +65,7 @@\n+@@ -40,8 +40,7 @@\n+ tezos-protocol-compiler\n+ compiler-libs.bytecomp)\n+ (flags (:standard -open Tezos_base__TzPervasives\n+- -open Tezos_protocol_compiler))\n+- (modules Byte))\n++ -open Tezos_protocol_compiler)) (modules Byte))\n+\n+ (library\n+ (name tezos_protocol_compiler_native)\n+@@ -66,7 +65,7 @@\n(public_name tezos-protocol-compiler)\n(modes native)\n(libraries tezos_protocol_compiler_native)\n@@ -62,39 +97,37 @@ index 21b4bec58..9af9818fd 100644\n(executable\ndiff --git a/src/proto_006_PsCARTHA/bin_accuser/dune b/src/proto_006_PsCARTHA/bin_accuser/dune\n-index e99ac8f95..401f9f2fe 100644\n+index a2aacd611..c072b2608 100644\n--- a/src/proto_006_PsCARTHA/bin_accuser/dune\n+++ b/src/proto_006_PsCARTHA/bin_accuser/dune\n-@@ -10,7 +10,10 @@\n+@@ -10,7 +10,9 @@\n-open Tezos_client_commands\n-open Tezos_baking_006_PsCARTHA_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-+ )))\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n- (alias\n- (name runtest_lint)\n+ (rule\n+ (alias runtest_lint)\ndiff --git a/src/proto_006_PsCARTHA/bin_baker/dune b/src/proto_006_PsCARTHA/bin_baker/dune\n-index d96ef4cde..855f24ac5 100644\n+index 90c152a3b..bfe9c1a3d 100644\n--- a/src/proto_006_PsCARTHA/bin_baker/dune\n+++ b/src/proto_006_PsCARTHA/bin_baker/dune\n-@@ -10,7 +10,10 @@\n+@@ -10,7 +10,9 @@\n-open Tezos_client_commands\n-open Tezos_baking_006_PsCARTHA_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-+ )))\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n- (alias\n- (name runtest_lint)\n+ (rule\n+ (alias runtest_lint)\ndiff --git a/src/proto_006_PsCARTHA/bin_endorser/dune b/src/proto_006_PsCARTHA/bin_endorser/dune\n-index c675ab3c5..ac0f52b7a 100644\n+index 4c8ec1004..e50f88e63 100644\n--- a/src/proto_006_PsCARTHA/bin_endorser/dune\n+++ b/src/proto_006_PsCARTHA/bin_endorser/dune\n@@ -106,42 +139,40 @@ index c675ab3c5..ac0f52b7a 100644\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n- (alias\n- (name runtest_lint)\n+ (rule\n+ (alias runtest_lint)\ndiff --git a/src/proto_007_PsDELPH1/bin_accuser/dune b/src/proto_007_PsDELPH1/bin_accuser/dune\n-index da3093f82..0e60e123a 100644\n+index 8fe05cdc3..dee6277ee 100644\n--- a/src/proto_007_PsDELPH1/bin_accuser/dune\n+++ b/src/proto_007_PsDELPH1/bin_accuser/dune\n-@@ -10,7 +10,10 @@\n+@@ -10,7 +10,9 @@\n-open Tezos_client_commands\n-open Tezos_baking_007_PsDELPH1_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-+ )))\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n- (alias\n- (name runtest_lint)\n+ (rule\n+ (alias runtest_lint)\ndiff --git a/src/proto_007_PsDELPH1/bin_baker/dune b/src/proto_007_PsDELPH1/bin_baker/dune\n-index 490b09f8c..1e9d89a87 100644\n+index 8b39572e3..7dd5146dd 100644\n--- a/src/proto_007_PsDELPH1/bin_baker/dune\n+++ b/src/proto_007_PsDELPH1/bin_baker/dune\n-@@ -10,7 +10,10 @@\n+@@ -10,7 +10,9 @@\n-open Tezos_client_commands\n-open Tezos_baking_007_PsDELPH1_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-+ )))\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n- (alias\n- (name runtest_lint)\n+ (rule\n+ (alias runtest_lint)\ndiff --git a/src/proto_007_PsDELPH1/bin_endorser/dune b/src/proto_007_PsDELPH1/bin_endorser/dune\n-index 074b4e006..cf801b59c 100644\n+index 049bd25a2..cfded7526 100644\n--- a/src/proto_007_PsDELPH1/bin_endorser/dune\n+++ b/src/proto_007_PsDELPH1/bin_endorser/dune\n@@ -153,33 +184,95 @@ index 074b4e006..cf801b59c 100644\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n- (alias\n- (name runtest_lint)\n-diff --git a/src/bin_codec/dune b/src/bin_codec/dune\n-index ae32d5d2a..50a2cf09f 100644\n---- a/src/bin_codec/dune\n-+++ b/src/bin_codec/dune\n-@@ -30,7 +30,9 @@\n- -open Tezos_clic\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune\n+index ee20d869a..1d6b596e0 100644\n+--- a/src/proto_alpha/bin_accuser/dune\n++++ b/src/proto_alpha/bin_accuser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_alpha_commands\n-open Tezos_stdlib_unix\n- -open Tezos_event_logging\n-- -linkall)))\n-+ -linkall -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n-+ )))\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n(rule\n- (target void_for_linking)\n-diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune\n-index c7f477c33..1fbee635e 100644\n---- a/src/bin_sandbox/dune\n-+++ b/src/bin_sandbox/dune\n-@@ -1,7 +1,7 @@\n- (executables\n- (names main)\n- (libraries flextesa)\n-- (flags :standard))\n-+ (flags :standard -ccopt -static))\n+ (alias runtest_lint)\n+diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune\n+index 5931e5c99..3a6f285d6 100644\n+--- a/src/proto_alpha/bin_baker/dune\n++++ b/src/proto_alpha/bin_baker/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_alpha_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+\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_alpha/bin_endorser/dune b/src/proto_alpha/bin_endorser/dune\n+index e822ec9a1..f92c34805 100644\n+--- a/src/proto_alpha/bin_endorser/dune\n++++ b/src/proto_alpha/bin_endorser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_alpha_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+\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_008_PtEdoTez/bin_accuser/dune b/src/proto_008_PtEdoTez/bin_accuser/dune\n+index 7474b94d8..4b0db6760 100644\n+--- a/src/proto_008_PtEdoTez/bin_accuser/dune\n++++ b/src/proto_008_PtEdoTez/bin_accuser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_008_PtEdoTez_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- (alias\n- (name runtest_sandbox_accusations_simple_double_baking)\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_008_PtEdoTez/bin_baker/dune b/src/proto_008_PtEdoTez/bin_baker/dune\n+index 3131e95c8..9b71de1e2 100644\n+--- a/src/proto_008_PtEdoTez/bin_baker/dune\n++++ b/src/proto_008_PtEdoTez/bin_baker/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_008_PtEdoTez_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+\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_008_PtEdoTez/bin_endorser/dune b/src/proto_008_PtEdoTez/bin_endorser/dune\n+index 81ebe6075..43e57a2d0 100644\n+--- a/src/proto_008_PtEdoTez/bin_endorser/dune\n++++ b/src/proto_008_PtEdoTez/bin_endorser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_008_PtEdoTez_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+\n+ (rule\n+ (alias runtest_lint)\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update static_libs.patch
|
603,652
|
09.11.2020 15:06:34
| -10,800
|
2cac17a13e5cc51ea89437d3a082bb0aaeebff5d
|
Adjuct hacks.nix
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "nix/build/bls12-381-add-Cargo.lock.patch",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+diff --git a/Cargo.lock b/Cargo.lock\n+new file mode 100644\n+index 0000000..bb07317\n+--- /dev/null\n++++ b/Cargo.lock\n+@@ -0,0 +1,223 @@\n++# This file is automatically @generated by Cargo.\n++# It is not intended for manual editing.\n++[[package]]\n++name = \"autocfg\"\n++version = \"1.0.1\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a\"\n++\n++[[package]]\n++name = \"byteorder\"\n++version = \"1.3.4\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de\"\n++\n++[[package]]\n++name = \"cfg-if\"\n++version = \"0.1.10\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822\"\n++\n++[[package]]\n++name = \"ff\"\n++version = \"0.6.0\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"c4b967a3ee6ae993f0094174257d404a5818f58be79d67a1aea1ec8996d28906\"\n++dependencies = [\n++ \"byteorder\",\n++ \"ff_derive\",\n++ \"rand_core\",\n++]\n++\n++[[package]]\n++name = \"ff_derive\"\n++version = \"0.6.0\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"a3776aaf60a45037a9c3cabdd8542b38693acaa3e241ff957181b72579d29feb\"\n++dependencies = [\n++ \"num-bigint\",\n++ \"num-integer\",\n++ \"num-traits\",\n++ \"proc-macro2\",\n++ \"quote\",\n++ \"syn\",\n++]\n++\n++[[package]]\n++name = \"getrandom\"\n++version = \"0.1.15\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6\"\n++dependencies = [\n++ \"cfg-if\",\n++ \"libc\",\n++ \"wasi\",\n++]\n++\n++[[package]]\n++name = \"group\"\n++version = \"0.6.0\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"f15be54742789e36f03307c8fdf0621201e1345e94f1387282024178b5e9ec8c\"\n++dependencies = [\n++ \"ff\",\n++ \"rand\",\n++ \"rand_xorshift\",\n++]\n++\n++[[package]]\n++name = \"libc\"\n++version = \"0.2.80\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614\"\n++\n++[[package]]\n++name = \"num-bigint\"\n++version = \"0.2.6\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304\"\n++dependencies = [\n++ \"autocfg\",\n++ \"num-integer\",\n++ \"num-traits\",\n++]\n++\n++[[package]]\n++name = \"num-integer\"\n++version = \"0.1.44\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db\"\n++dependencies = [\n++ \"autocfg\",\n++ \"num-traits\",\n++]\n++\n++[[package]]\n++name = \"num-traits\"\n++version = \"0.2.14\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290\"\n++dependencies = [\n++ \"autocfg\",\n++]\n++\n++[[package]]\n++name = \"pairing\"\n++version = \"0.16.0\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"b8290dea210a712682cd65031dc2b34fd132cf2729def3df7ee08f0737ff5ed6\"\n++dependencies = [\n++ \"byteorder\",\n++ \"ff\",\n++ \"group\",\n++ \"rand_core\",\n++]\n++\n++[[package]]\n++name = \"ppv-lite86\"\n++version = \"0.2.10\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857\"\n++\n++[[package]]\n++name = \"proc-macro2\"\n++version = \"1.0.24\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71\"\n++dependencies = [\n++ \"unicode-xid\",\n++]\n++\n++[[package]]\n++name = \"quote\"\n++version = \"1.0.7\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37\"\n++dependencies = [\n++ \"proc-macro2\",\n++]\n++\n++[[package]]\n++name = \"rand\"\n++version = \"0.7.3\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03\"\n++dependencies = [\n++ \"getrandom\",\n++ \"libc\",\n++ \"rand_chacha\",\n++ \"rand_core\",\n++ \"rand_hc\",\n++]\n++\n++[[package]]\n++name = \"rand_chacha\"\n++version = \"0.2.2\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402\"\n++dependencies = [\n++ \"ppv-lite86\",\n++ \"rand_core\",\n++]\n++\n++[[package]]\n++name = \"rand_core\"\n++version = \"0.5.1\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19\"\n++dependencies = [\n++ \"getrandom\",\n++]\n++\n++[[package]]\n++name = \"rand_hc\"\n++version = \"0.2.0\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c\"\n++dependencies = [\n++ \"rand_core\",\n++]\n++\n++[[package]]\n++name = \"rand_xorshift\"\n++version = \"0.2.0\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8\"\n++dependencies = [\n++ \"rand_core\",\n++]\n++\n++[[package]]\n++name = \"rustc-bls12-381\"\n++version = \"0.7.2\"\n++dependencies = [\n++ \"ff\",\n++ \"group\",\n++ \"libc\",\n++ \"pairing\",\n++ \"rand\",\n++ \"rand_core\",\n++]\n++\n++[[package]]\n++name = \"syn\"\n++version = \"1.0.53\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"8833e20724c24de12bbaba5ad230ea61c3eafb05b881c7c9d3cfe8638b187e68\"\n++dependencies = [\n++ \"proc-macro2\",\n++ \"quote\",\n++ \"unicode-xid\",\n++]\n++\n++[[package]]\n++name = \"unicode-xid\"\n++version = \"0.2.1\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564\"\n++\n++[[package]]\n++name = \"wasi\"\n++version = \"0.9.0+wasi-snapshot-preview1\"\n++source = \"registry+https://github.com/rust-lang/crates.io-index\"\n++checksum = \"cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519\"\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "# This file needs to become empty.\nself: super: oself: osuper:\n-with oself; rec {\n+with oself;\n+# external rust libraries\n+let\n+ rustc-bls12-381 = self.rustPlatform.buildRustPackage rec {\n+ pname = \"rustc-bls12-381\";\n+ version = \"0.7.2\";\n+ RUSTFLAGS = \"-C target-feature=-crt-static -C lto=off\";\n+ src = builtins.fetchTarball {\n+ url = \"https://gitlab.com/dannywillems/rustc-bls12-381/-/archive/0.7.2/rustc-bls12-381-0.7.2.tar.gz\";\n+ };\n+ cargoSha256 = \"1wdapzy2qk7ml17sihls3pykj740spzrm8mbvh4495wq5r07v2gr\";\n+ cargoPatches = [\n+ # a patch file to add Cargo.lock in the source code\n+ ./bls12-381-add-Cargo.lock.patch\n+ ];\n+ };\n+ librustzcash = self.rustPlatform.buildRustPackage rec {\n+ pname = \"librustzcash\";\n+ version = \"0.1.0\";\n+ RUSTFLAGS = \"-C target-feature=-crt-static -C lto=off\";\n+ src = builtins.fetchTarball {\n+ url = \"https://github.com/zcash/librustzcash/archive/0.1.0.tar.gz\";\n+ };\n+ cargoSha256 = \"1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax\";\n+ };\n+ zcash-params = import ./zcash.nix {};\n+ zcash-post-fixup = pkg: ''\n+ mv $bin/${pkg.name} $bin/${pkg.name}-wrapped\n+ makeWrapper $bin/${pkg.name}-wrapped $bin/${pkg.name} --prefix XDG_DATA_DIRS : ${zcash-params}\n+ '';\n+in\n+rec {\nocaml = self.ocaml-ng.ocamlPackages_4_09.ocaml.overrideAttrs (o: o // {\nhardeningDisable = o.hardeningDisable ++\nself.stdenv.lib.optional self.stdenv.hostPlatform.isMusl \"pie\";\n@@ -15,45 +46,63 @@ with oself; rec {\nocamlgraph = osuper.ocamlgraph.override (_: { gtkSupport = false; });\n# FIXME opam-nix needs to do version resolution\n- ezjsonm = osuper.ezjsonm.versions.\"1.1.0\";\n- ipaddr = osuper.ipaddr.versions.\"4.0.0\".overrideAttrs (_: {\n- minimumOCamlVersion = \"4.07\";\n- });\n-\n- # Here we pin old tls version because more recent versions\n- # cannot be build with dune < 2.0.0, which will require\n- # to override dune version for huge amount of dependencies.\n- # Also opam-nix currently unable to build tls package, so\n- # we build it in a bit hacky way.\n- tls = osuper.tls.versions.\"0.10.6\".overrideAttrs (o: {\n- outputs = [ \"out\" ];\n- buildInputs = o.buildInputs ++ [ topkg ];\n- buildPhase = ''\n- ${topkg.run} build --tests false --with-mirage false --with-lwt true\n- '';\n- checkPhase = \"${topkg.run} test\";\n- inherit (topkg) installPhase;\n+ ezjsonm = osuper.ezjsonm.versions.\"1.2.0\";\n+ hacl-star-raw = osuper.hacl-star-raw.overrideAttrs (o: rec {\n+ preConfigure = \"patchShebangs raw/configure\";\n+ sourceRoot = \".\";\n+ buildInputs = o.buildInputs ++ [ self.which ];\n+ propagatedBuildInputs = buildInputs;\n});\n- x509 = osuper.x509.versions.\"0.9.0\";\n- conduit = osuper.conduit.versions.\"2.1.0\".overrideAttrs (oa: rec {\n- buildInputs = [ tls ] ++ oa.buildInputs;\n+ hacl-star = osuper.hacl-star.overrideAttrs (_: rec {\n+ sourceRoot = \".\";\n+ });\n+ irmin = osuper.irmin.versions.\"2.2.0\";\n+ irmin-pack = osuper.irmin-pack.versions.\"2.2.0\".overrideAttrs (o : rec {\n+ buildInputs = o.buildInputs ++ [ alcotest-lwt ];\npropagatedBuildInputs = buildInputs;\n- minimumOCamlVersion = \"4.07\";\n});\n- conduit-lwt-unix = osuper.conduit-lwt-unix.versions.\"2.0.2\";\n- cohttp-lwt-unix = osuper.cohttp-lwt-unix.versions.\"2.4.0\";\n- cohttp-lwt = osuper.cohttp-lwt.versions.\"2.4.0\";\n- macaddr = osuper.macaddr.versions.\"4.0.0\".overrideAttrs (_: {\n- minimumOCamlVersion = \"4.07\";\n+ pcre = osuper.pcre.overrideAttrs (o: rec {\n+ buildInputs = o.buildInputs ++ [ odoc ];\n+ propagatedBuildInputs = buildInputs;\n});\n- lwt = osuper.lwt.versions.\"4.2.1\";\n+ bls12-381 = osuper.bls12-381.overrideAttrs (o:\n+ rec {\n+ buildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\n+ buildPhase = ''\n+ cp ${rustc-bls12-381.src}/include/* src/\n+ '' + o.buildPhase;\n+ });\n+\n+ sapling = osuper.sapling.overrideAttrs (o:\n+ let extern-C-patch = ./librustzcash-extern-C.patch; in\n+ rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash rustc-bls12-381 self.gcc self.git ];\n+ buildPhase = ''\n+ cp ${librustzcash.src}/librustzcash/include/librustzcash.h .\n+ patch librustzcash.h ${extern-C-patch}\n+ '' + o.buildPhase;\n+ }\n+ );\n+ zarith = osuper.zarith.overrideAttrs(_ : {\n+ version = \"1.10\";\n+ src = self.fetchurl {\n+ url = \"https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz\";\n+ sha256 = \"1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb\";\n+ };\n+ });\n# FIXME opam-nix needs to handle \"external\" (native) dependencies correctly\nconf-gmp = self.gmp;\nconf-libev = self.libev;\nconf-hidapi = self.hidapi;\nconf-pkg-config = self.pkg-config;\n+ conf-libffi = self.libffi;\n+ conf-which = null;\n+ conf-rust = self.cargo;\n+ conf-libpcre = self.pcre;\n+ conf-perl = self.perl;\n+ ctypes-foreign = oself.ctypes;\n# FIXME X11 in nixpkgs musl\nlablgtk = null;\n@@ -61,30 +110,104 @@ with oself; rec {\n# FIXME recursive dependencies WTF\nbigstring = osuper.bigstring.overrideAttrs (_: { doCheck = false; });\n- # FIXME vendors/index\n- index = oself.index-super;\n+ tezos-protocol-environment = osuper.tezos-protocol-environment.overrideAttrs (o: rec {\n+ buildInputs = o.buildInputs ++ [ zarith ];\n+ propagatedBuildInputs = buildInputs;\n+ });\n# FIXME dependencies in tezos-protocol-compiler.opam\ntezos-protocol-compiler = osuper.tezos-protocol-compiler.overrideAttrs\n(oa: rec {\n- buildInputs = oa.buildInputs ++ [ oself.pprint ];\n+ buildInputs = oa.buildInputs ++ [ oself.pprint rustc-bls12-381 ];\npropagatedBuildInputs = buildInputs;\n});\n+ # packages depend on rust library\n+ tezos-validator = osuper.tezos-validator.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ });\n+ tezos-protocol-006-PsCARTHA-parameters = osuper.tezos-protocol-006-PsCARTHA-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\n+ tezos-protocol-007-PsDELPH1-parameters = osuper.tezos-protocol-007-PsDELPH1-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\n+ tezos-protocol-008-PtEdoTez-parameters = osuper.tezos-protocol-008-PtEdoTez-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\n+\n# FIXME apply this patch upstream\ntezos-stdlib-unix = osuper.tezos-stdlib-unix.overrideAttrs\n(_: { patches = [ ./stdlib-unix.patch ]; });\ntezos-client = osuper.tezos-client.overrideAttrs\n- (_: { postInstall = \"rm $bin/tezos-admin-client $bin/*.sh\"; });\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postInstall = \"rm $bin/tezos-admin-client $bin/*.sh\";\n+ postFixup = zcash-post-fixup o;\n+ });\n+\n+ tezos-accuser-007-PsDELPH1 = osuper.tezos-accuser-007-PsDELPH1.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-baker-007-PsDELPH1 = osuper.tezos-baker-007-PsDELPH1.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-endorser-007-PsDELPH1 = osuper.tezos-endorser-007-PsDELPH1.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-accuser-008-PtEdoTez = osuper.tezos-accuser-008-PtEdoTez.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-baker-008-PtEdoTez = osuper.tezos-baker-008-PtEdoTez.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-endorser-008-PtEdoTez = osuper.tezos-endorser-008-PtEdoTez.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-codec = osuper.tezos-codec.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ rustc-bls12-381 librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n+ tezos-signer = osuper.tezos-signer.overrideAttrs\n+ (o: {\n+ buildInputs = o.buildInputs ++ [ rustc-bls12-381 librustzcash self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n+ });\n- tezos-admin-client = osuper.tezos-client.overrideAttrs (_: {\n+ tezos-admin-client = (osuper.tezos-client.overrideAttrs (o: {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\nname = \"tezos-admin-client\";\npostInstall = \"rm $bin/tezos-client $bin/*.sh\";\n+ })).overrideAttrs (o: {\n+ buildInputs = o.buildInputs ++ [self.makeWrapper ];\n+ postFixup = zcash-post-fixup o;\n});\ntezos-node =\nosuper.tezos-node.overrideAttrs (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostInstall = \"rm $bin/*.sh\";\n+ postFixup = zcash-post-fixup o;\n});\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "nix/build/librustzcash-extern-C.patch",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+--- librustzcash.h 2020-12-03 18:47:49.089346672 +0300\n++++ librustzcash.h_modified 2020-12-03 18:37:02.521880920 +0300\n+@@ -3,7 +3,9 @@\n+\n+ #include <stdint.h>\n+\n++#ifdef __cplusplus\n+ extern \"C\" {\n++#endif\n+ #ifdef WIN32\n+ typedef uint16_t codeunit;\n+ #else\n+@@ -307,6 +309,8 @@\n+ unsigned char *j_ret,\n+ unsigned char *addr_ret\n+ );\n++#ifdef __cplusplus\n+ }\n++#endif\n+\n+ #endif // LIBRUSTZCASH_INCLUDE_H_\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/static-overlay.nix",
"new_path": "nix/build/static-overlay.nix",
"diff": "@@ -32,4 +32,5 @@ in {\ninherit name;\nvalue = makeStaticDefaults osuper.${name};\n}) (builtins.filter (elem: elem.name != \"tezos-sandbox\") release-binaries)));\n+ libffi = dds super.libffi;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "nix/build/zcash.nix",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+# zcash-params required for building some of the tezos binaries\n+# and for running tests\n+{ pkgs ? import ./pkgs.nix {}}:\n+with pkgs;\n+let\n+ sapling-spend-params = fetchurl {\n+ url = \"https://download.z.cash/downloads/sapling-spend.params\";\n+ sha256 = \"04zwgrkpb6x782x9d05p0id2hccw5prh94jqqpcmyfmv7b9gyj4f\";\n+ };\n+ sapling-output-params = fetchurl {\n+ url = \"https://download.z.cash/downloads/sapling-output.params\";\n+ sha256 = \"1r5h7wzhwmw8vcww74b1vr6ynacwm3myg5x3jpzcy2xvp75vn3ig\";\n+ };\n+ sprout-groth-16-params = fetchurl {\n+ url = \"https://download.z.cash/downloads/sprout-groth16.params\";\n+ sha256 = \"0l2vwl7bz9a8yhmbfrdji2vj5iw4qk3wi2g5pn7lja03qq0dg1dn\";\n+ };\n+in stdenv.mkDerivation {\n+ name = \"zcash-params\";\n+ phases = [ \"installPhase\" ];\n+ installPhase = ''\n+ mkdir -p $out/zcash-params/\n+ cp ${sapling-spend-params} $out/zcash-params/sapling-spend.params\n+ cp ${sapling-output-params} $out/zcash-params/sapling-output.params\n+ cp ${sprout-groth-16-params} $out/zcash-params/sprout-groth16.params\n+ '';\n+}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjuct hacks.nix
|
603,652
|
07.12.2020 16:07:49
| -10,800
|
02b9f1f4089aaac69d4b3a5c2274e284a344741b
|
Bump opam-nix
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"homepage\": null,\n\"owner\": \"balsoft\",\n\"repo\": \"opam-nix\",\n- \"rev\": \"a7b8e16ab28c840eab2c3be2f5069524dc87fd58\",\n- \"sha256\": \"0ydbwbirz1ag1lprl2mxz3cvzqxn945yfnakhzm19q2qm78zlb37\",\n+ \"rev\": \"3d619a4c9f759e8ee13f428faac0d13938f087ee\",\n+ \"sha256\": \"1gp1skm7nkvfg0sdyc2jal44rbfsja8hcl393rs0zhm41b7j61vm\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/balsoft/opam-nix/archive/a7b8e16ab28c840eab2c3be2f5069524dc87fd58.tar.gz\",\n+ \"url\": \"https://github.com/balsoft/opam-nix/archive/3d619a4c9f759e8ee13f428faac0d13938f087ee.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
|
603,652
|
07.12.2020 16:08:00
| -10,800
|
081584b45c97a8fd2565d3140034ef852cc32add
|
Build dynamic binaries via nix
Problem: Rust doesn't work well with musl, see
Solution: Provide dynamically linked binaries instead. This should be
fine since we don't use them in the releases and they're mostly used in
our internal infrastructure.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/README.md",
"new_path": "nix/README.md",
"diff": "# Building and packaging tezos using nix\n-## Statically built binaries\n+## Dynamically built binaries\nIn order to build all binaries run:\n```bash\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -7,12 +7,11 @@ let\npkgs = import ./build/pkgs.nix { };\nsource = (import ./nix/sources.nix).tezos;\nprotocols = import ./protocols.nix;\n- bin = pkgs.callPackage ./build/bin.nix { };\nrelease-binaries = builtins.filter (elem: elem.name != \"tezos-sandbox\")\n(import ./build/release-binaries.nix);\nbinaries = builtins.listToAttrs (map (meta: {\ninherit (meta) name;\n- value = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; };\n+ value = pkgs.ocamlPackages.${meta.name} // { inherit meta; };\n}) release-binaries);\n# Bundle the contents of a package set together, leaving the original attrs intact\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Build dynamic binaries via nix
Problem: Rust doesn't work well with musl, see
https://github.com/NixOS/nixpkgs/issues/71195.
Solution: Provide dynamically linked binaries instead. This should be
fine since we don't use them in the releases and they're mostly used in
our internal infrastructure.
|
603,652
|
07.12.2020 16:17:11
| -10,800
|
6f41e11b2613711d8592fdd7d32eba21375468a8
|
Fix tests
Now we have dynamic and static binaries, we should tests them in
different environment.
Also, nix binaries are now wrapped with a script that adds zcash to
`XGD_DATA_DIRS`, so we should test nix derivations directly instead of
downloading binaries from the previous job.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -17,14 +17,10 @@ steps:\n- label: build via nix\ncommands:\n- nix-build ./nix -A binaries -o binaries\n- artifact_paths:\n- - ./binaries/bin/*\nbranches: \"!master\"\n- label: test nix-built binaries\ncommands:\n- - buildkite-agent artifact download \"binaries/bin/*\" . --step \"build via nix\"\n- - chmod +x ./binaries/bin/*\n- - nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./binaries/bin\n+ - nix-build tests/tezos-nix-binaries.nix --no-out-link\nbranches: \"!master\"\n- label: build via docker\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -37,7 +37,11 @@ def run_node(network, use_tls):\n+ network\n+ \" &\"\n)\n- tls_endpoint = \" --endpoint https://localhost:8732/ \" if use_tls else \" \"\n+ tls_endpoint = (\n+ \" --endpoint https://127.0.0.1:8732/ \"\n+ if use_tls\n+ else \" --endpoint http://127.0.0.1:8732/ \"\n+ )\nmachine.wait_until_succeeds(\ntezos_client + tls_endpoint + \"rpc get chains/main/blocks/head/\"\n)\n@@ -45,7 +49,11 @@ def run_node(network, use_tls):\ndef run_node_with_daemons(network, use_tls):\nrun_node(network, use_tls)\n- tls_endpoint = \" --endpoint https://localhost:8732/ \" if use_tls else \" \"\n+ tls_endpoint = (\n+ \" --endpoint https://127.0.0.1:8732/ \"\n+ if use_tls\n+ else \" --endpoint http://127.0.0.1:8732/ \"\n+ )\nmachine.succeed(\nf\"{tezos_baker} -d client-dir\"\n+ tls_endpoint\n@@ -63,7 +71,11 @@ def kill_node_with_daemons():\ndef test_node_with_daemons_scenario(network, use_tls=False):\n- tls_endpoint = \" --endpoint https://localhost:8732/ \" if use_tls else \" \"\n+ tls_endpoint = (\n+ \" --endpoint https://127.0.0.1:8732/ \"\n+ if use_tls\n+ else \" --endpoint http://127.0.0.1:8732/ \"\n+ )\nrun_node_with_daemons(network, use_tls)\nmachine.succeed(\ntezos_admin_client + tls_endpoint + \"rpc get chains/main/blocks/head/\"\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-binaries.nix",
"new_path": "tests/tezos-binaries.nix",
"diff": "{ path-to-binaries ? null } @ args:\nlet\nnixpkgs = (import ../nix/nix/sources.nix).nixpkgs;\n-in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ pkgs, ... }:\n+ pkgs = import ../nix/build/pkgs.nix {};\n+ zcash = import ../nix/build/zcash.nix {};\n+in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n{\n- nodes.machine = { ... }: { virtualisation.memorySize = 1024; };\n+ nodes.machine = { ... }: {\n+ virtualisation.memorySize = 1024;\n+ virtualisation.diskSize = 1024;\n+ environment.sessionVariables.XDG_DATA_DIRS =\n+ [ \"${zcash}\" ];\n+ };\ntestScript = ''\npath_to_binaries = \"${path-to-binaries}\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/tezos-nix-binaries.nix",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+let\n+ nixpkgs = (import ../nix/nix/sources.nix).nixpkgs;\n+ pkgs = import ../nix/build/pkgs.nix {};\n+ inherit (pkgs.ocamlPackages) tezos-client tezos-admin-client tezos-node tezos-signer tezos-codec\n+ tezos-accuser-007-PsDELPH1 tezos-baker-007-PsDELPH1 tezos-endorser-007-PsDELPH1;\n+in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n+{\n+ nodes.machine = { ... }: {\n+ virtualisation.memorySize = 1024;\n+ virtualisation.diskSize = 1024;\n+ environment.systemPackages = with pkgs; [\n+ libev\n+ ];\n+ environment.sessionVariables.LD_LIBRARY_PATH =\n+ [ \"${pkgs.ocamlPackages.hacl-star-raw}/lib/ocaml/4.09.1/site-lib/hacl-star-raw\" ];\n+ };\n+\n+ testScript = ''\n+ tezos_accuser = \"${tezos-accuser-007-PsDELPH1}/bin/tezos-accuser-007-PsDELPH1\"\n+ tezos_admin_client = \"${tezos-admin-client}/bin/tezos-admin-client\"\n+ tezos_baker = \"${tezos-baker-007-PsDELPH1}/bin/tezos-baker-007-PsDELPH1\"\n+ tezos_client = (\n+ \"${tezos-client}/bin/tezos-client\"\n+ )\n+ tezos_endorser = \"${tezos-endorser-007-PsDELPH1}/bin/tezos-endorser-007-PsDELPH1\"\n+ tezos_node = \"${tezos-node}/bin/tezos-node\"\n+ tezos_signer = (\n+ \"${tezos-signer}/bin/tezos-signer\"\n+ )\n+ tezos_codec = \"${tezos-codec}/bin/tezos-codec\"\n+ openssl = \"${pkgs.openssl.bin}/bin/openssl\"\n+ binaries = [\n+ tezos_accuser,\n+ tezos_admin_client,\n+ tezos_baker,\n+ tezos_client,\n+ tezos_endorser,\n+ tezos_node,\n+ tezos_signer,\n+ tezos_codec,\n+ ]\n+ ${builtins.readFile ./test_script.py}'';\n+})\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Fix tests
Now we have dynamic and static binaries, we should tests them in
different environment.
Also, nix binaries are now wrapped with a script that adds zcash to
`XGD_DATA_DIRS`, so we should test nix derivations directly instead of
downloading binaries from the previous job.
|
603,652
|
22.12.2020 17:08:10
| -10,800
|
97cc99d36ec09bf92bb7e9d26f8e23aff959d6bc
|
Update dockerfiles
Problem: Now it's required to use specific rust compiler version
(1.44.0).
Solution: Use alpine 3.12, in which this rust version is default for
the rust package.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/Dockerfile",
"new_path": "docker/build/Dockerfile",
"diff": "# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-FROM alpine:3.11\n+FROM alpine:3.12\nRUN apk update\nRUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \\\nbubblewrap wget pkgconfig gmp-dev libev-dev hidapi-dev eudev-dev perl opam libusb-dev bash \\\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/build/Dockerfile.aarch64",
"new_path": "docker/build/Dockerfile.aarch64",
"diff": "# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-FROM alpine:3.11 as binary-fetch\n+FROM alpine:3.12 as binary-fetch\n# Latest v5.0.0-2 qemu-user-static has some weird bug that causes curl and wget to segfault.\n# See https://bugs.launchpad.net/qemu/+bug/1892684.\nRUN wget https://github.com/multiarch/qemu-user-static/releases/download/v4.2.0-7/qemu-aarch64-static\nRUN chmod +x qemu-aarch64-static\n-FROM arm64v8/alpine:3.11\n+FROM arm64v8/alpine:3.12\nCOPY --from=binary-fetch qemu-aarch64-static /usr/bin/qemu-aarch64-static\nRUN apk update\nRUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \\\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update dockerfiles
Problem: Now it's required to use specific rust compiler version
(1.44.0).
Solution: Use alpine 3.12, in which this rust version is default for
the rust package.
|
603,652
|
11.01.2021 15:38:05
| -10,800
|
a0de90f36458514e30102aa26347d01727e8cba9
|
Prune sprout-groth-16-params
They seem to be unused by the tezos binaries and only sapling related
params are actually used.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/zcash.nix",
"new_path": "nix/build/zcash.nix",
"diff": "@@ -15,10 +15,6 @@ let\nurl = \"https://download.z.cash/downloads/sapling-output.params\";\nsha256 = \"1r5h7wzhwmw8vcww74b1vr6ynacwm3myg5x3jpzcy2xvp75vn3ig\";\n};\n- sprout-groth-16-params = fetchurl {\n- url = \"https://download.z.cash/downloads/sprout-groth16.params\";\n- sha256 = \"0l2vwl7bz9a8yhmbfrdji2vj5iw4qk3wi2g5pn7lja03qq0dg1dn\";\n- };\nin stdenv.mkDerivation {\nname = \"zcash-params\";\nphases = [ \"installPhase\" ];\n@@ -26,6 +22,5 @@ in stdenv.mkDerivation {\nmkdir -p $out/zcash-params/\ncp ${sapling-spend-params} $out/zcash-params/sapling-spend.params\ncp ${sapling-output-params} $out/zcash-params/sapling-output.params\n- cp ${sprout-groth-16-params} $out/zcash-params/sprout-groth16.params\n'';\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Prune sprout-groth-16-params
They seem to be unused by the tezos binaries and only sapling related
params are actually used.
|
603,652
|
11.01.2021 16:25:10
| -10,800
|
e7998df7024d3de27a8f5ef41551fb57e829236b
|
Add formulas for tezos binaries.
Problem: We want to provide a way to obtain Tezos binaries on macOS.
Solution: The most convenient way is to use 'brew'. Create formulas for
all Tezos binaires (dedicated formula for each binary)
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosAccuser007Psdelph1 < Tezos\n+ init\n+ desc \"Daemon for accusing\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/proto_007_PsDELPH1/bin_accuser/main_accuser_007_PsDELPH1.exe\",\n+ \"_build/default/src/proto_007_PsDELPH1/bin_accuser/main_accuser_007_PsDELPH1.exe\",\n+ \"tezos-accuser-007-PsDELPH1\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-accuser-008-PtEdoTez.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosAccuser008Ptedotez < Tezos\n+ init\n+ desc \"Daemon for accusing\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/proto_008_PtEdoTez/bin_accuser/main_accuser_008_PtEdoTez.exe\",\n+ \"_build/default/src/proto_008_PtEdoTez/bin_accuser/main_accuser_008_PtEdoTez.exe\",\n+ \"tezos-accuser-008-PtEdoTez\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-admin-client.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosAdminClient < Tezos\n+ init\n+ desc \"Administration tool for the node\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/bin_client/main_admin.exe\",\n+ \"_build/default/src/bin_client/main_admin.exe\",\n+ \"tezos-admin-client\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosBaker007Psdelph1 < Tezos\n+ init\n+ desc \"Daemon for baking\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/proto_007_PsDELPH1/bin_baker/main_baker_007_PsDELPH1.exe\",\n+ \"_build/default/src/proto_007_PsDELPH1/bin_baker/main_baker_007_PsDELPH1.exe\",\n+ \"tezos-baker-007-PsDELPH1\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-baker-008-PtEdoTez.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosBaker008Ptedotez < Tezos\n+ init\n+ desc \"Daemon for baking\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/proto_008_PtEdoTez/bin_baker/main_baker_008_PtEdoTez.exe\",\n+ \"_build/default/src/proto_008_PtEdoTez/bin_baker/main_baker_008_PtEdoTez.exe\",\n+ \"tezos-baker-008-PtEdoTez\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-client.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosClient < Tezos\n+ init\n+ desc \"CLI client for interacting with tezos blockchain\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/bin_client/main_client.exe\",\n+ \"_build/default/src/bin_client/main_client.exe\",\n+ \"tezos-client\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-codec.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosCodec < Tezos\n+ init\n+ desc \"A client to decode and encode JSON\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/bin_codec/codec.exe\",\n+ \"_build/default/src/bin_codec/codec.exe\",\n+ \"tezos-codec\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosEndorser007Psdelph1 < Tezos\n+ init\n+ desc \"Daemon for endorsing\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/proto_007_PsDELPH1/bin_endorser/main_endorser_007_PsDELPH1.exe\",\n+ \"_build/default/src/proto_007_PsDELPH1/bin_endorser/main_endorser_007_PsDELPH1.exe\",\n+ \"tezos-endorser-007-PsDELPH1\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-endorser-008-PtEdoTez.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosEndorser008Ptedotez < Tezos\n+ init\n+ desc \"Daemon for endorsing\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/proto_008_PtEdoTez/bin_endorser/main_endorser_008_PtEdoTez.exe\",\n+ \"_build/default/src/proto_008_PtEdoTez/bin_endorser/main_endorser_008_PtEdoTez.exe\",\n+ \"tezos-endorser-008-PtEdoTez\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-node.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosNode < Tezos\n+ init\n+ desc \"Entry point for initializing, configuring and running a Tezos node\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/bin_node/main.exe\",\n+ \"_build/default/src/bin_node/main.exe\",\n+ \"tezos-node\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-sandbox.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosSandbox < Tezos\n+ init\n+ desc \"A tool for setting up and running testing scenarios with the local blockchain\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/bin_sandbox/main.exe\",\n+ \"_build/default/src/bin_sandbox/main.exe\",\n+ \"tezos-sandbox\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-signer.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+require File.join(File.dirname(__FILE__), \"tezos\")\n+\n+class TezosSigner < Tezos\n+ init\n+ desc \"A client to remotely sign operations or blocks\"\n+\n+ def install\n+ make_deps\n+ install_template \"src/bin_signer/main_signer.exe\",\n+ \"_build/default/src/bin_signer/main_signer.exe\",\n+ \"tezos-signer\"\n+ end\n+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+\n+# Base formula that defines parts common for all Tezos related formulas.\n+class Tezos < Formula\n+ def self.init\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 => \"v8.1\", :shallow => false\n+\n+ version \"v8.1-1\"\n+\n+ build_dependencies = %w[pkg-config autoconf rsync wget opam rust]\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+ end\n+\n+ def make_deps\n+ ENV.deparallelize\n+\n+ system \"opam\", \"init\", \"--bare\", \"--debug\", \"--auto-setup\", \"--disable-sandboxing\"\n+\n+ ENV[\"RUST_VERSION\"] = \"1.49.0\"\n+ system \"make\", \"build-deps\"\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+end\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#103] Add formulas for tezos binaries.
Problem: We want to provide a way to obtain Tezos binaries on macOS.
Solution: The most convenient way is to use 'brew'. Create formulas for
all Tezos binaires (dedicated formula for each binary)
|
603,652
|
21.01.2021 13:34:30
| -10,800
|
45fb4d67692bc57db69e087c8ab2afcedc53aa5e
|
Add Mojave bottles
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosAccuser007Psdelph1 < Tezos\ninit\ndesc \"Daemon for accusing\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"2606f8d58c65e3331ec3a008f5f02f6f0275f11367a88abaaf7cd223d27f03a9\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/proto_007_PsDELPH1/bin_accuser/main_accuser_007_PsDELPH1.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdoTez.rb",
"new_path": "Formula/tezos-accuser-008-PtEdoTez.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosAccuser008Ptedotez < Tezos\ninit\ndesc \"Daemon for accusing\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"edb15ab67300edf8f79fe1d4b17f9971cf42441f0a291a99407ee7ade328e643\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/proto_008_PtEdoTez/bin_accuser/main_accuser_008_PtEdoTez.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosAdminClient < Tezos\ninit\ndesc \"Administration tool for the node\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"85cc3175582cf85a68fce480f5147f7717d1b3d4a7c2afe0e263be0c4055b63f\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/bin_client/main_admin.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"new_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosBaker007Psdelph1 < Tezos\ninit\ndesc \"Daemon for baking\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"5987ec0292c3324b2d194da55175f20490f9a2c41b23df9a9cd8355ec37dde1d\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/proto_007_PsDELPH1/bin_baker/main_baker_007_PsDELPH1.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdoTez.rb",
"new_path": "Formula/tezos-baker-008-PtEdoTez.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosBaker008Ptedotez < Tezos\ninit\ndesc \"Daemon for baking\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"401a4f9b578fc854e36f752ecfd6c9b83b167ab41201c3044495b385d17750ce\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/proto_008_PtEdoTez/bin_baker/main_baker_008_PtEdoTez.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -9,9 +9,9 @@ class TezosClient < Tezos\ndesc \"CLI client for interacting with tezos blockchain\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/auto-release\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\ncellar :any\n- sha256 \"bd2914e75b77de28b1362832023deda078025a68a046011e26c5efb05e9a4497\" => :mojave\n+ sha256 \"b8e78e557bda6fb821201c99d88bf04831ec49398c087dfd26586fe047bcfa11\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosCodec < Tezos\ninit\ndesc \"A client to decode and encode JSON\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"3be0ac706f19bd6a673dd64c5d20b7973b353d80273dc56f3905cb39e6acc03d\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/bin_codec/codec.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosEndorser007Psdelph1 < Tezos\ninit\ndesc \"Daemon for endorsing\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"4c6e0eb419f2eed337d90e7177f77bb954f8a5ff6c6966605fb4f25dee759e3d\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/proto_007_PsDELPH1/bin_endorser/main_endorser_007_PsDELPH1.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdoTez.rb",
"new_path": "Formula/tezos-endorser-008-PtEdoTez.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosEndorser008Ptedotez < Tezos\ninit\ndesc \"Daemon for endorsing\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"1dd1320fd2ff27a7dee5cdf9bd7c275be311ccbad9ce5b40006595ec63b1d2dd\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/proto_008_PtEdoTez/bin_endorser/main_endorser_008_PtEdoTez.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosNode < Tezos\ninit\ndesc \"Entry point for initializing, configuring and running a Tezos node\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"e93c6796c4ccffc459904ade15ff50a22bb6d3456f56bddd2c41c42ecf5823aa\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/bin_node/main.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosSandbox < Tezos\ninit\ndesc \"A tool for setting up and running testing scenarios with the local blockchain\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"1a72776411771d6970aa1b2ea9c4dee5680f2b097b3824bb91b9c93a951d5cf2\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/bin_sandbox/main.exe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -8,6 +8,12 @@ class TezosSigner < Tezos\ninit\ndesc \"A client to remotely sign operations or blocks\"\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ cellar :any\n+ sha256 \"b9ff4fd61589fdd085ac39fac79ed4bf4e7557ca25a69a7dcab3060fc951a62f\" => :mojave\n+ end\n+\ndef install\nmake_deps\ninstall_template \"src/bin_signer/main_signer.exe\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#103] Add Mojave bottles
|
603,652
|
21.01.2021 15:38:04
| -10,800
|
a411efc2a4b19f791fcdf3a8559350746b6c1c88
|
Add Catalina bottles
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosAccuser007Psdelph1 < Tezos\ndesc \"Daemon for accusing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser007Psdelph1.version}/\"\ncellar :any\nsha256 \"2606f8d58c65e3331ec3a008f5f02f6f0275f11367a88abaaf7cd223d27f03a9\" => :mojave\n+ sha256 \"303f6cd063351eb94f10da9323e77d162a495ef1b92a9886eef11f3c105fb70e\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdoTez.rb",
"new_path": "Formula/tezos-accuser-008-PtEdoTez.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosAccuser008Ptedotez < Tezos\ndesc \"Daemon for accusing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedotez.version}/\"\ncellar :any\nsha256 \"edb15ab67300edf8f79fe1d4b17f9971cf42441f0a291a99407ee7ade328e643\" => :mojave\n+ sha256 \"e83a8fb139d85c023ee63895f8650cd4c4ea3dcb705e7df6244bb6cc41a8130d\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosAdminClient < Tezos\ndesc \"Administration tool for the node\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\nsha256 \"85cc3175582cf85a68fce480f5147f7717d1b3d4a7c2afe0e263be0c4055b63f\" => :mojave\n+ sha256 \"85ab3e2eefbd8de39a6daf83aa82e7b49e28b5d2908ba5dec53a30444cb597a0\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"new_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosBaker007Psdelph1 < Tezos\ndesc \"Daemon for baking\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker007Psdelph1.version}/\"\ncellar :any\nsha256 \"5987ec0292c3324b2d194da55175f20490f9a2c41b23df9a9cd8355ec37dde1d\" => :mojave\n+ sha256 \"24ef8ab58d747ccaf93c53003b45d06cceffc4b610e86fb25f1c89cc7f345e61\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdoTez.rb",
"new_path": "Formula/tezos-baker-008-PtEdoTez.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosBaker008Ptedotez < Tezos\ndesc \"Daemon for baking\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedotez.version}/\"\ncellar :any\nsha256 \"401a4f9b578fc854e36f752ecfd6c9b83b167ab41201c3044495b385d17750ce\" => :mojave\n+ sha256 \"d189db274b0efd42252ddfa4888f9f25981c23427724a7bc5ac1b3366572161e\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosClient < Tezos\ndesc \"CLI client for interacting with tezos blockchain\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\nsha256 \"b8e78e557bda6fb821201c99d88bf04831ec49398c087dfd26586fe047bcfa11\" => :mojave\n+ sha256 \"387cfbd1a97878b40e92d0ffdc2293ef3df6945838ec8df5851fd3ea195fabfd\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosCodec < Tezos\ndesc \"A client to decode and encode JSON\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\nsha256 \"3be0ac706f19bd6a673dd64c5d20b7973b353d80273dc56f3905cb39e6acc03d\" => :mojave\n+ sha256 \"e738541a16f804f74c4e35ef1a03f6af6fa7a2d42c2adcd7191cde63bc8b1d17\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosEndorser007Psdelph1 < Tezos\ndesc \"Daemon for endorsing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser007Psdelph1.version}/\"\ncellar :any\nsha256 \"4c6e0eb419f2eed337d90e7177f77bb954f8a5ff6c6966605fb4f25dee759e3d\" => :mojave\n+ sha256 \"70537f634f1644d593c54598676ff921837d3f2f1f67ae5123fc09b39fbfc55b\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdoTez.rb",
"new_path": "Formula/tezos-endorser-008-PtEdoTez.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosEndorser008Ptedotez < Tezos\ndesc \"Daemon for endorsing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedotez.version}/\"\ncellar :any\nsha256 \"1dd1320fd2ff27a7dee5cdf9bd7c275be311ccbad9ce5b40006595ec63b1d2dd\" => :mojave\n+ sha256 \"328e3cf310114f12b60b04320c8f8f29f96e4aaee3259315008ee14d7c11d8b9\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosNode < Tezos\ndesc \"Entry point for initializing, configuring and running a Tezos node\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\nsha256 \"e93c6796c4ccffc459904ade15ff50a22bb6d3456f56bddd2c41c42ecf5823aa\" => :mojave\n+ sha256 \"f984bb1df0cb7af3aa565c42ef2022ef640236bea67e4af4b984880cd7abecad\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosSandbox < Tezos\ndesc \"A tool for setting up and running testing scenarios with the local blockchain\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\nsha256 \"1a72776411771d6970aa1b2ea9c4dee5680f2b097b3824bb91b9c93a951d5cf2\" => :mojave\n+ sha256 \"825a7648ea2b8e6f4f18603a6d29252abf4c3670031a1d39a089081b4dcac640\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -9,9 +9,10 @@ class TezosSigner < Tezos\ndesc \"A client to remotely sign operations or blocks\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/v8.1-1/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\nsha256 \"b9ff4fd61589fdd085ac39fac79ed4bf4e7557ca25a69a7dcab3060fc951a62f\" => :mojave\n+ sha256 \"ee0e9f4a29711af31a603fdc46a774bdf53a7ca1f8c82a25ab0dadac45b32c62\" => :catalina\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#103] Add Catalina bottles
|
603,652
|
21.01.2021 18:24:41
| -10,800
|
c1ec0261d389cd9e3da3a3580cdcb71472ebbedb
|
Add ToC to the main README
Problem: Main README is already quite big and it's hard to navigate
through it.
Solution: Add table of contents to the beginning of the README.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -26,6 +26,17 @@ Other binaries can be used with all protocols if they're new enough. E.g.\n007 protocol is supported only from `v7.4`. `tezos-node` can be set up to run\ndifferent networks, you can read more about this in [this article](https://tezos.gitlab.io/user/multinetwork.html).\n+## Table of contents\n+\n+* [Static linux binaries](#static-linux)\n+* [Native Ubuntu packages](#ubuntu)\n+* [Native Fedora packages](#fedora)\n+* [Other linux](#linux)\n+* [Brew tap for macOS](#macos)\n+* [Systemd services for Tezos binaries](#systemd)\n+* [Building instructions](#building)\n+\n+<a name=\"static-linux\"></a>\n## Obtain binaries from github release\nRecomended way to get these binaries is to download them from assets from github release.\n@@ -37,6 +48,7 @@ with which protocol binary is compatible with. If this is not the\ncase, then consult release notes to check which protocols are\nsupported by that binary.\n+<a name=\"ubuntu\"></a>\n## Ubuntu Launchpad PPA with `tezos-*` binaries\nIf you are using Ubuntu you can use PPA in order to install `tezos-*` executables.\n@@ -50,6 +62,7 @@ sudo apt-get install tezos-baker-007-psdelph1\n```\nOnce you install such packages the commands `tezos-*` will be available.\n+<a name=\"fedora\"></a>\n## Fedora Copr repository with `tezos-*` binaries\nIf you are using Fedora you can use Copr in order to install `tezos-*`\n@@ -67,6 +80,7 @@ sudo yum install tezos-baker-007-PsDELPH1\n```\nOnce you install such packages the commands `tezos-*` will be available.\n+<a name=\"linux\"></a>\n## Other Linux distros usage\nDownload binaries from release assets.\n@@ -80,6 +94,7 @@ chmod +x tezos-client\nRun `./tezos-client` or add it to your PATH to be able to run it anywhere.\n+<a name=\"macos\"></a>\n## Brew tap for macOS\nIf you're using macOS and `brew`, you can install Tezos binaries from the tap\n@@ -102,6 +117,7 @@ Note that this might take a while, because builds don't share common parts and f\ndependencies are compiled from scratch. Once the bottles are built, the corresponding sections in the\nformulas should be updated. Also, bottles should be uploaded to the release artifacts.\n+<a name=\"systemd\"></a>\n## Systemd units for `tezos-node` and daemons\n### Systemd units on Ubuntu or Fedora\n@@ -181,6 +197,7 @@ One should provide desired node address, data directory for daemon files and nod\n* Over HTTPS (`tezos-signer-https.service`)\nEach signer service has dedicated config file in e.g. `/etc/default/tezos-signer-{mode}`.\n+<a name=\"building\"></a>\n## Build Instructions\nThis repository provides two distinct ways for building and packaging tezos binaries:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add ToC to the main README
Problem: Main README is already quite big and it's hard to navigate
through it.
Solution: Add table of contents to the beginning of the README.
|
603,652
|
20.01.2021 16:18:50
| -10,800
|
08a21e36085f051d6bd7ddd7f4781f0c29fb4886
|
Update dependencies
It's time to resurrect native packaging because opam repository was
finally updated. Luckily, existing packaging approach works nearly out
of the box, only the dependency set should be updated a bit.
|
[
{
"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 m4 perl pkg-config \\\n- rpmdevtools python3 wget opam rsync\n+RUN dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel m4 perl pkg-config \\\n+ rpmdevtools python3 wget opam rsync which cargo\nENV USER dockerbuilder\nRUN useradd dockerbuilder && mkdir /tezos-packaging\nENV HOME /tezos-packaging\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile-ubuntu",
"new_path": "docker/package/Dockerfile-ubuntu",
"diff": "# SPDX-License-Identifier: LicenseRef-MIT-TQ\nFROM ubuntu:18.04\n-RUN apt-get update && apt-get install -y libev-dev libgmp-dev libhidapi-dev m4 perl pkg-config \\\n+RUN apt-get update && apt-get install -y libev-dev libgmp-dev libhidapi-dev libffi-dev m4 perl pkg-config \\\ndebhelper dh-make dh-systemd devscripts autotools-dev python3 python3-distutils wget\nRUN apt-get install -y software-properties-common && add-apt-repository ppa:avsm/ppa -y && apt-get update && apt-get install -y opam\n+RUN add-apt-repository ppa:ubuntu-mozilla-security/rust-next -y && apt-get update && apt-get -y install cargo\nENV USER dockerbuilder\nRUN useradd dockerbuilder && mkdir /tezos-packaging\nENV HOME /tezos-packaging\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -41,10 +41,10 @@ date = subprocess.check_output([\"date\", \"-R\"]).decode().strip()\nmeta = json.load(open(f\"{os.path.dirname(__file__)}/../../meta.json\", \"r\"))\nif is_ubuntu:\n- run_deps = [\"libev-dev\", \"libgmp-dev\", \"libhidapi-dev\"]\n+ run_deps = [\"libev-dev\", \"libgmp-dev\", \"libhidapi-dev\", \"libffi-dev\"]\nelse:\n- run_deps = [\"libev-devel\", \"gmp-devel\", \"hidapi-devel\"]\n-build_deps = [\"make\", \"m4\", \"perl\", \"pkg-config\", \"wget\", \"unzip\", \"rsync\", \"gcc\"]\n+ run_deps = [\"libev-devel\", \"gmp-devel\", \"hidapi-devel\", \"libffi-devel\"]\n+build_deps = [\"make\", \"m4\", \"perl\", \"pkg-config\", \"wget\", \"unzip\", \"rsync\", \"gcc\", \"cargo\"]\ncommon_deps = run_deps + build_deps\nactive_protocols = json.load(open(f\"{os.path.dirname(__file__)}/../../protocols.json\", \"r\"))[\"active\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -5,7 +5,7 @@ import os, shutil, sys, subprocess, json\nfrom .model import Service, ServiceFile, SystemdUnit, Unit, Package\n-networks = [\"mainnet\", \"delphinet\"]\n+networks = [\"mainnet\", \"delphinet\", \"edonet\"]\nsigner_units = [\nSystemdUnit(\n@@ -98,7 +98,8 @@ daemon_decs = {\ndefault_testnets = {\n\"006-PsCARTHA\": \"carthagenet\",\n- \"007-PsDELPH1\": \"delphinet\"\n+ \"007-PsDELPH1\": \"delphinet\",\n+ \"008-PtEdoTez\": \"edonet\"\n}\nfor proto in active_protocols:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update dependencies
It's time to resurrect native packaging because opam repository was
finally updated. Luckily, existing packaging approach works nearly out
of the box, only the dependency set should be updated a bit.
|
603,652
|
20.01.2021 16:20:24
| -10,800
|
377ab4911ac792aee82531b761d37ad6e7f6687e
|
Uncomment native packaging related CI stages
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -69,49 +69,48 @@ steps:\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\nbranches: \"!master\"\n- # Native packaging is suspended for now, because opam-repository isn't updated\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: 30\n- # agents:\n- # queue: \"docker\"\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-007-PsDELPH1\n- # - rm -rf out\n- # branches: \"!master\"\n- # timeout_in_minutes: 30\n- # agents:\n- # queue: \"docker\"\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: 30\n- # agents:\n- # queue: \"docker\"\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-007-PsDELPH1\n- # - rm -rf out\n- # branches: \"!master\"\n- # timeout_in_minutes: 30\n- # agents:\n- # queue: \"docker\"\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: 30\n+ agents:\n+ queue: \"docker\"\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-007-PsDELPH1\n+ - rm -rf out\n+ branches: \"!master\"\n+ timeout_in_minutes: 30\n+ agents:\n+ queue: \"docker\"\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: 30\n+ agents:\n+ queue: \"docker\"\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-007-PsDELPH1\n+ - rm -rf out\n+ branches: \"!master\"\n+ timeout_in_minutes: 30\n+ agents:\n+ queue: \"docker\"\n- wait\n- label: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Uncomment native packaging related CI stages
|
603,652
|
22.01.2021 14:44:56
| -10,800
|
8587608be815125cbea45ba09dbd7914d7a4302b
|
Update systemd service
1) Use combined --endpoint option
2) Make endorser alias configurable
3) Make node data dir for baker configurable
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/defaults/tezos-accuser.conf",
"new_path": "docker/package/defaults/tezos-accuser.conf",
"diff": "# SPDX-License-Identifier: LicenseRef-MIT-TQ\n# shellcheck disable=SC2034\n-NODE_HOST=\"localhost\"\n-NODE_RPC_PORT=\"8732\"\n+NODE_RPC_ENDPOINT=\"http://localhost:8732\"\nDATA_DIR=\"/var/lib/tezos/accuser\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/defaults/tezos-baker.conf",
"new_path": "docker/package/defaults/tezos-baker.conf",
"diff": "# shellcheck disable=SC2034\nDATA_DIR=\"/var/lib/tezos/baker\"\n-NODE_RPC_PORT=\"8732\"\n+NODE_DATA_DIR=\"\"\n+NODE_RPC_ENDPOINT=\"http://localhost:8732\"\nBAKER_ACCOUNT=\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/defaults/tezos-endorser.conf",
"new_path": "docker/package/defaults/tezos-endorser.conf",
"diff": "# SPDX-License-Identifier: LicenseRef-MIT-TQ\n# shellcheck disable=SC2034\n-NODE_HOST=\"localhost\"\n-NODE_RPC_PORT=\"8732\"\n+NODE_RPC_ENDPOINT=\"http://localhost:8732\"\nDATA_DIR=\"/var/lib/tezos/endorser\"\n+ENDORSER_ACCOUNT=\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -71,7 +71,7 @@ packages = [\nnode_units = []\nfor network in networks:\n- env = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\", \"NODE_RPC_PORT=8732\",\n+ env = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\", \"NODE_RPC_ADDR=127.0.0.1:8732\",\n\"CERT_PATH=\", \"KEY_PATH=\"]\nservice_file = ServiceFile(Unit(after=[\"network.target\"], requires=[],\ndescription=f\"Tezos node {network}\"),\n@@ -103,9 +103,7 @@ default_testnets = {\n}\nfor proto in active_protocols:\n- service_file_baker = ServiceFile(Unit(after=[\"network.target\",\n- f\"tezos-node-{default_testnets[proto]}.service\"],\n- requires=[f\"tezos-node-{default_testnets[proto]}.service\"],\n+ service_file_baker = ServiceFile(Unit(after=[\"network.target\"],\ndescription=\"Tezos baker\"),\nService(environment_file=f\"/etc/default/tezos-baker-{proto}\",\nenvironment=[f\"PROTOCOL={proto}\"],\n@@ -136,9 +134,9 @@ for proto in active_protocols:\nproto,\noptional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]))\npackages.append(Package(f\"tezos-endorser-{proto}\", \"Daemon for endorsing\",\n- [SystemdUnit(service_file=service_file_accuser,\n+ [SystemdUnit(service_file=service_file_endorser,\nstartup_script=\"tezos-endorser-start\",\n- config_file=\"tezos-baker.conf\")],\n+ config_file=\"tezos-endorser.conf\")],\nproto,\noptional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]))\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-accuser-start",
"new_path": "docker/package/scripts/tezos-accuser-start",
"diff": "@@ -16,14 +16,14 @@ mkdir -p \"$accuser_dir\"\nif [ ! -f \"$accuser_config\" ]; then\n\"$accuser\" --base-dir \"$accuser_dir\" \\\n- --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nconfig init --output \"$accuser_config\" >/dev/null 2>&1\nelse\n\"$accuser\" --base-dir \"$accuser_dir\" \\\n- --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nconfig update >/dev/null 2>&1\nfi\nexec \"$accuser\" --base-dir \"$accuser_dir\" \\\n- --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nrun \"$@\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-baker-start",
"new_path": "docker/package/scripts/tezos-baker-start",
"diff": "@@ -16,17 +16,17 @@ mkdir -p \"$baker_dir\"\nif [ ! -f \"$baker_config\" ]; then\n\"$baker\" --base-dir \"$baker_dir\" \\\n- --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nconfig init --output \"$baker_config\" >/dev/null 2>&1\nelse\n\"$baker\" --base-dir \"$baker_dir\" \\\n- --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nconfig update >/dev/null 2>&1\nfi\nlaunch_baker() {\nexec \"$baker\" \\\n- --base-dir \"$baker_dir\" --port \"$NODE_RPC_PORT\" \\\n+ --base-dir \"$baker_dir\" --endpoint \"$NODE_RPC_ENDPOINT\" \\\nrun with local node \"$NODE_DATA_DIR\" \"$@\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-endorser-start",
"new_path": "docker/package/scripts/tezos-endorser-start",
"diff": "@@ -9,21 +9,29 @@ set -euo pipefail\n# $PROTOCOL should be defined in the system unit environment\nendorser=\"/usr/bin/tezos-endorser-$PROTOCOL\"\n-endorser_dir=\"$DATA_DIR/endorser\"\n+endorser_dir=\"$DATA_DIR\"\nendorser_config=\"$endorser_dir/config\"\nmkdir -p \"$endorser_dir\"\nif [ ! -f \"$endorser_config\" ]; then\n\"$endorser\" --base-dir \"$endorser_dir\" \\\n- --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nconfig init --output \"$endorser_config\" >/dev/null 2>&1\nelse\n\"$endorser\" --base-dir \"$endorser_dir\" \\\n- --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nconfig update >/dev/null 2>&1\nfi\n+launch_endorser() {\nexec \"$endorser\" --base-dir \"$endorser_dir\" \\\n- --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\nrun \"$@\"\n+}\n+\n+if [[ -z \"$ENDORSER_ACCOUNT\" ]]; then\n+ launch_endorser \"$@\"\n+else\n+ launch_endorser \"$ENDORSER_ACCOUNT\" \"$@\"\n+fi\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-start",
"new_path": "docker/package/scripts/tezos-node-start",
"diff": "@@ -13,24 +13,17 @@ if [ ! -f \"$DATA_DIR/config.json\" ]; then\necho \"Configuring the node...\"\n\"$node\" config init \\\n--data-dir \"$DATA_DIR\" \\\n- --rpc-addr \":$NODE_RPC_PORT\" \\\n+ --rpc-addr \"$NODE_RPC_ADDR\" \\\n--network \"$NETWORK\"\n\"$@\"\nelse\necho \"Updating the node configuration...\"\n\"$node\" config update \\\n--data-dir \"$DATA_DIR\" \\\n- --rpc-addr \":$NODE_RPC_PORT\" \\\n+ --rpc-addr \"$NODE_RPC_ADDR\" \\\n--network \"$NETWORK\"\n\"$@\"\nfi\n-# Generate a new identity if not present\n-\n-if [ ! -f \"$DATA_DIR/identity.json\" ]; then\n- echo \"Generating a new node identity...\"\n- \"$node\" identity generate \"${IDENTITY_POW:-26}\". \\\n- --data-dir \"$DATA_DIR\"\n-fi\n# Launching the node\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update systemd service
1) Use combined --endpoint option
2) Make endorser alias configurable
3) Make node data dir for baker configurable
|
603,652
|
11.02.2021 14:28:53
| -10,800
|
c772b9397d9d460b26d8b470a0f0dc05774bf8dc
|
Bump Tezos version
|
[
{
"change_type": "MODIFY",
"old_path": "FormulaAbstract/tezos.rb",
"new_path": "FormulaAbstract/tezos.rb",
"diff": "@@ -13,9 +13,9 @@ class Tezos < Formula\nend\nhomepage \"https://gitlab.com/tezos/tezos\"\n- url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v8.1\", :shallow => false\n+ url \"https://gitlab.com/tezos/tezos.git\", :tag => \"v8.2\", :shallow => false\n- version \"v8.1-1\"\n+ version \"v8.2-1\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget opam rust]\nbuild_dependencies.each do |dependency|\n"
},
{
"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/v8.1\",\n+ \"ref\": \"refs/tags/v8.2\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"d74e7b6d763745f6d1b8a5fdf4ef9098268ebe7b\",\n+ \"rev\": \"6102c808a21b32e732ab9bb1825761cd056f3e86\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump Tezos version
|
603,652
|
11.02.2021 14:31:26
| -10,800
|
3ccfda6d36f6a854b4d5c4a8a5450bca38e6fdaf
|
Update 008 protocol name
Problem: PtEdoTez was deprecated due to a bug in ticket implementation.
Solution: Allow it for backward compatibility and activate new version
of edo protocol called '008-PtEdo2Zk'.
|
[
{
"change_type": "RENAME",
"old_path": "Formula/tezos-accuser-008-PtEdoTez.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\n-class TezosAccuser008Ptedotez < Tezos\n+class TezosAccuser008Ptedo2zk < Tezos\ninit\ndesc \"Daemon for accusing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedotez.version}/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"edb15ab67300edf8f79fe1d4b17f9971cf42441f0a291a99407ee7ade328e643\" => :mojave\nsha256 \"e83a8fb139d85c023ee63895f8650cd4c4ea3dcb705e7df6244bb6cc41a8130d\" => :catalina\n@@ -17,8 +17,8 @@ class TezosAccuser008Ptedotez < Tezos\ndef install\nmake_deps\n- install_template \"src/proto_008_PtEdoTez/bin_accuser/main_accuser_008_PtEdoTez.exe\",\n- \"_build/default/src/proto_008_PtEdoTez/bin_accuser/main_accuser_008_PtEdoTez.exe\",\n- \"tezos-accuser-008-PtEdoTez\"\n+ install_template \"src/proto_008_PtEdo2Zk/bin_accuser/main_accuser_008_PtEdo2Zk.exe\",\n+ \"_build/default/src/proto_008_PtEdo2Zk/bin_accuser/main_accuser_008_PtEdo2Zk.exe\",\n+ \"tezos-accuser-008-PtEdo2Zk\"\nend\nend\n"
},
{
"change_type": "RENAME",
"old_path": "Formula/tezos-baker-008-PtEdoTez.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\n-class TezosBaker008Ptedotez < Tezos\n+class TezosBaker008Ptedo2zk < Tezos\ninit\ndesc \"Daemon for baking\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedotez.version}/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"401a4f9b578fc854e36f752ecfd6c9b83b167ab41201c3044495b385d17750ce\" => :mojave\nsha256 \"d189db274b0efd42252ddfa4888f9f25981c23427724a7bc5ac1b3366572161e\" => :catalina\n@@ -17,8 +17,8 @@ class TezosBaker008Ptedotez < Tezos\ndef install\nmake_deps\n- install_template \"src/proto_008_PtEdoTez/bin_baker/main_baker_008_PtEdoTez.exe\",\n- \"_build/default/src/proto_008_PtEdoTez/bin_baker/main_baker_008_PtEdoTez.exe\",\n- \"tezos-baker-008-PtEdoTez\"\n+ install_template \"src/proto_008_PtEdo2Zk/bin_baker/main_baker_008_PtEdo2Zk.exe\",\n+ \"_build/default/src/proto_008_PtEdo2Zk/bin_baker/main_baker_008_PtEdo2Zk.exe\",\n+ \"tezos-baker-008-PtEdo2Zk\"\nend\nend\n"
},
{
"change_type": "RENAME",
"old_path": "Formula/tezos-endorser-008-PtEdoTez.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\n-class TezosEndorser008Ptedotez < Tezos\n+class TezosEndorser008Ptedo2zk < Tezos\ninit\ndesc \"Daemon for endorsing\"\nbottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedotez.version}/\"\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"1dd1320fd2ff27a7dee5cdf9bd7c275be311ccbad9ce5b40006595ec63b1d2dd\" => :mojave\nsha256 \"328e3cf310114f12b60b04320c8f8f29f96e4aaee3259315008ee14d7c11d8b9\" => :catalina\n@@ -17,8 +17,8 @@ class TezosEndorser008Ptedotez < Tezos\ndef install\nmake_deps\n- install_template \"src/proto_008_PtEdoTez/bin_endorser/main_endorser_008_PtEdoTez.exe\",\n- \"_build/default/src/proto_008_PtEdoTez/bin_endorser/main_endorser_008_PtEdoTez.exe\",\n- \"tezos-endorser-008-PtEdoTez\"\n+ install_template \"src/proto_008_PtEdo2Zk/bin_endorser/main_endorser_008_PtEdo2Zk.exe\",\n+ \"_build/default/src/proto_008_PtEdo2Zk/bin_endorser/main_endorser_008_PtEdo2Zk.exe\",\n+ \"tezos-endorser-008-PtEdo2Zk\"\nend\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "@@ -231,13 +231,13 @@ index e822ec9a1..f92c34805 100644\n(rule\n(alias runtest_lint)\n-diff --git a/src/proto_008_PtEdoTez/bin_accuser/dune b/src/proto_008_PtEdoTez/bin_accuser/dune\n+diff --git a/src/proto_008_PtEdo2Zk/bin_accuser/dune b/src/proto_008_PtEdo2Zk/bin_accuser/dune\nindex 7474b94d8..4b0db6760 100644\n---- a/src/proto_008_PtEdoTez/bin_accuser/dune\n-+++ b/src/proto_008_PtEdoTez/bin_accuser/dune\n+--- a/src/proto_008_PtEdo2Zk/bin_accuser/dune\n++++ b/src/proto_008_PtEdo2Zk/bin_accuser/dune\n-open Tezos_client_commands\n- -open Tezos_baking_008_PtEdoTez_commands\n+ -open Tezos_baking_008_PtEdo2Zk_commands\n-open Tezos_stdlib_unix\n- -open Tezos_client_base_unix)))\n+ -open Tezos_client_base_unix\n@@ -246,13 +246,13 @@ index 7474b94d8..4b0db6760 100644\n(rule\n(alias runtest_lint)\n-diff --git a/src/proto_008_PtEdoTez/bin_baker/dune b/src/proto_008_PtEdoTez/bin_baker/dune\n+diff --git a/src/proto_008_PtEdo2Zk/bin_baker/dune b/src/proto_008_PtEdo2Zk/bin_baker/dune\nindex 3131e95c8..9b71de1e2 100644\n---- a/src/proto_008_PtEdoTez/bin_baker/dune\n-+++ b/src/proto_008_PtEdoTez/bin_baker/dune\n+--- a/src/proto_008_PtEdo2Zk/bin_baker/dune\n++++ b/src/proto_008_PtEdo2Zk/bin_baker/dune\n-open Tezos_client_commands\n- -open Tezos_baking_008_PtEdoTez_commands\n+ -open Tezos_baking_008_PtEdo2Zk_commands\n-open Tezos_stdlib_unix\n- -open Tezos_client_base_unix)))\n+ -open Tezos_client_base_unix\n@@ -261,13 +261,13 @@ index 3131e95c8..9b71de1e2 100644\n(rule\n(alias runtest_lint)\n-diff --git a/src/proto_008_PtEdoTez/bin_endorser/dune b/src/proto_008_PtEdoTez/bin_endorser/dune\n+diff --git a/src/proto_008_PtEdo2Zk/bin_endorser/dune b/src/proto_008_PtEdo2Zk/bin_endorser/dune\nindex 81ebe6075..43e57a2d0 100644\n---- a/src/proto_008_PtEdoTez/bin_endorser/dune\n-+++ b/src/proto_008_PtEdoTez/bin_endorser/dune\n+--- a/src/proto_008_PtEdo2Zk/bin_endorser/dune\n++++ b/src/proto_008_PtEdo2Zk/bin_endorser/dune\n-open Tezos_client_commands\n- -open Tezos_baking_008_PtEdoTez_commands\n+ -open Tezos_baking_008_PtEdo2Zk_commands\n-open Tezos_stdlib_unix\n- -open Tezos_client_base_unix)))\n+ -open Tezos_client_base_unix\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -137,7 +137,7 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\nXDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n});\n- tezos-protocol-008-PtEdoTez-parameters = osuper.tezos-protocol-008-PtEdoTez-parameters.overrideAttrs\n+ tezos-protocol-008-PtEdo2Zk-parameters = osuper.tezos-protocol-008-PtEdo2Zk-parameters.overrideAttrs\n(o: rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\nXDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n@@ -169,17 +169,17 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-accuser-008-PtEdoTez = osuper.tezos-accuser-008-PtEdoTez.overrideAttrs\n+ tezos-accuser-008-PtEdo2Zk = osuper.tezos-accuser-008-PtEdo2Zk.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-baker-008-PtEdoTez = osuper.tezos-baker-008-PtEdoTez.overrideAttrs\n+ tezos-baker-008-PtEdo2Zk = osuper.tezos-baker-008-PtEdo2Zk.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-endorser-008-PtEdoTez = osuper.tezos-endorser-008-PtEdoTez.overrideAttrs\n+ tezos-endorser-008-PtEdo2Zk = osuper.tezos-endorser-008-PtEdo2Zk.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "\"004-Pt24m4xi\",\n\"005-PsBABY5H\",\n\"005-PsBabyM1\",\n- \"006-PsCARTHA\"\n+ \"006-PsCARTHA\",\n+ \"008-PtEdoTez\"\n],\n\"active\": [\n\"007-PsDELPH1\",\n- \"008-PtEdoTez\"\n+ \"008-PtEdo2Zk\"\n]\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update 008 protocol name
Problem: PtEdoTez was deprecated due to a bug in ticket implementation.
Solution: Allow it for backward compatibility and activate new version
of edo protocol called '008-PtEdo2Zk'.
|
603,652
|
11.02.2021 14:38:40
| -10,800
|
16d4569f3691804e725e52e0768f2ed749db6245
|
Bundle all protocols with native tezos-node
Problem: Native tezos-node doesn't have embedded old protocols. Thus,
it's harder to bootstrap mainnet node from scratch.
Solution: Bundle all old 'tezos-embedded-protocol-*'
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -84,7 +84,15 @@ for network in networks:\nstartup_script=\"tezos-node-start\"))\npackages.append(Package(\"tezos-node\",\n\"Entry point for initializing, configuring and running a Tezos node\",\n- node_units))\n+ node_units,\n+ optional_opam_deps=[\n+ \"tezos-embedded-protocol-001-PtCJ7pwo\",\n+ \"tezos-embedded-protocol-002-PsYLVpVv\",\n+ \"tezos-embedded-protocol-003-PsddFKi3\",\n+ \"tezos-embedded-protocol-004-Pt24m4xi\",\n+ \"tezos-embedded-protocol-005-PsBABY5H\",\n+ \"tezos-embedded-protocol-005-PsBabyM1\",\n+ \"tezos-embedded-protocol-006-PsCARTHA\"]))\nactive_protocols = json.load(open(f\"{os.path.dirname( __file__)}/../../protocols.json\", \"r\"))[\"active\"]\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bundle all protocols with native tezos-node
Problem: Native tezos-node doesn't have embedded old protocols. Thus,
it's harder to bootstrap mainnet node from scratch.
Solution: Bundle all old 'tezos-embedded-protocol-*'
|
603,652
|
11.02.2021 14:59:18
| -10,800
|
ba0b6cd99ef9440c0a44ce8501746f411c2c8e41
|
Remove outdated brew bottles
Problem: New version of Tezos arrived. However, brew formulas still
point to old bottles.
Solution: Remove all bottles for now, they'll be added to a
corresponding github release later. Once the bottles are uploaded,
formulas will be updated as well.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosAccuser007Psdelph1 < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser007Psdelph1.version}/\"\ncellar :any\n- sha256 \"2606f8d58c65e3331ec3a008f5f02f6f0275f11367a88abaaf7cd223d27f03a9\" => :mojave\n- sha256 \"303f6cd063351eb94f10da9323e77d162a495ef1b92a9886eef11f3c105fb70e\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosAccuser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"edb15ab67300edf8f79fe1d4b17f9971cf42441f0a291a99407ee7ade328e643\" => :mojave\n- sha256 \"e83a8fb139d85c023ee63895f8650cd4c4ea3dcb705e7df6244bb6cc41a8130d\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosAdminClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\n- sha256 \"85cc3175582cf85a68fce480f5147f7717d1b3d4a7c2afe0e263be0c4055b63f\" => :mojave\n- sha256 \"85ab3e2eefbd8de39a6daf83aa82e7b49e28b5d2908ba5dec53a30444cb597a0\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"new_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosBaker007Psdelph1 < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker007Psdelph1.version}/\"\ncellar :any\n- sha256 \"5987ec0292c3324b2d194da55175f20490f9a2c41b23df9a9cd8355ec37dde1d\" => :mojave\n- sha256 \"24ef8ab58d747ccaf93c53003b45d06cceffc4b610e86fb25f1c89cc7f345e61\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosBaker008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"401a4f9b578fc854e36f752ecfd6c9b83b167ab41201c3044495b385d17750ce\" => :mojave\n- sha256 \"d189db274b0efd42252ddfa4888f9f25981c23427724a7bc5ac1b3366572161e\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\n- sha256 \"b8e78e557bda6fb821201c99d88bf04831ec49398c087dfd26586fe047bcfa11\" => :mojave\n- sha256 \"387cfbd1a97878b40e92d0ffdc2293ef3df6945838ec8df5851fd3ea195fabfd\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosCodec < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\n- sha256 \"3be0ac706f19bd6a673dd64c5d20b7973b353d80273dc56f3905cb39e6acc03d\" => :mojave\n- sha256 \"e738541a16f804f74c4e35ef1a03f6af6fa7a2d42c2adcd7191cde63bc8b1d17\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosEndorser007Psdelph1 < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser007Psdelph1.version}/\"\ncellar :any\n- sha256 \"4c6e0eb419f2eed337d90e7177f77bb954f8a5ff6c6966605fb4f25dee759e3d\" => :mojave\n- sha256 \"70537f634f1644d593c54598676ff921837d3f2f1f67ae5123fc09b39fbfc55b\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosEndorser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"1dd1320fd2ff27a7dee5cdf9bd7c275be311ccbad9ce5b40006595ec63b1d2dd\" => :mojave\n- sha256 \"328e3cf310114f12b60b04320c8f8f29f96e4aaee3259315008ee14d7c11d8b9\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosNode < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\n- sha256 \"e93c6796c4ccffc459904ade15ff50a22bb6d3456f56bddd2c41c42ecf5823aa\" => :mojave\n- sha256 \"f984bb1df0cb7af3aa565c42ef2022ef640236bea67e4af4b984880cd7abecad\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosSandbox < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\n- sha256 \"1a72776411771d6970aa1b2ea9c4dee5680f2b097b3824bb91b9c93a951d5cf2\" => :mojave\n- sha256 \"825a7648ea2b8e6f4f18603a6d29252abf4c3670031a1d39a089081b4dcac640\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosSigner < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\n- sha256 \"b9ff4fd61589fdd085ac39fac79ed4bf4e7557ca25a69a7dcab3060fc951a62f\" => :mojave\n- sha256 \"ee0e9f4a29711af31a603fdc46a774bdf53a7ca1f8c82a25ab0dadac45b32c62\" => :catalina\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Remove outdated brew bottles
Problem: New version of Tezos arrived. However, brew formulas still
point to old bottles.
Solution: Remove all bottles for now, they'll be added to a
corresponding github release later. Once the bottles are uploaded,
formulas will be updated as well.
|
603,652
|
11.02.2021 19:08:57
| -10,800
|
d26acea916ee12d2d155998fcc4f3f5cd5929588
|
Suspend native packaging for now
Problem: We need to release static binaries ASAP.
Solution: Don't wait for opam-repository PR to be merged and disable
native packaging checks in CI for now.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -69,50 +69,51 @@ steps:\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\nbranches: \"!master\"\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: 30\n- agents:\n- queue: \"docker\"\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-007-PsDELPH1\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- - 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: 30\n- agents:\n- queue: \"docker\"\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-007-PsDELPH1\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+ # TODO: Uncomment once https://github.com/ocaml/opam-repository/pull/18133 is merged\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: 30\n+ # agents:\n+ # queue: \"docker\"\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-007-PsDELPH1\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+ # - 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: 30\n+ # agents:\n+ # queue: \"docker\"\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-007-PsDELPH1\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- wait\n- label: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Suspend native packaging for now
Problem: We need to release static binaries ASAP.
Solution: Don't wait for opam-repository PR to be merged and disable
native packaging checks in CI for now.
|
603,652
|
12.02.2021 10:52:38
| -10,800
|
8094ce4aad6a33995038599350cad34a90660296
|
Add catalina bottles hashes
Problem: MacOS users don't want to build Tezos from scratch.
Solution: Provide bottles with Tezos binaries for MacOS Catalina.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosAccuser007Psdelph1 < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser007Psdelph1.version}/\"\ncellar :any\n+ sha256 \"de6b8c02b8dffd110acd290a451e2a351e9f37b173eac22f4963a0b7bc3913ea\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosAccuser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"c5e5e21e6413c8a669ae1febedbaf294814cb98bb27f43b16d8e02ff11b82f21\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosAdminClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\n+ sha256 \"c960611dff0c7a3c0be44f7f56c555a722bf4bc905cb6ba9dbd7bbcb7218d6c2\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"new_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosBaker007Psdelph1 < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker007Psdelph1.version}/\"\ncellar :any\n+ sha256 \"c915cc5827546a2f2842b7904d17e6a962a3a16fbe019a2cf50335fb7fb91b18\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosBaker008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"b2a05a2cbed1fc6dfe9bd2025676a3a718fb976fc6d1140e7fa3b691eb72be81\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\n+ sha256 \"2aaddacfbc9328a2b4d4066851c9f073901842bc1a1464f6cc94e0b603066184\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosCodec < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\n+ sha256 \"aeab96953b1014aa5009cc89e4919b111a24d33192c452849387721bd030be94\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosEndorser007Psdelph1 < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser007Psdelph1.version}/\"\ncellar :any\n+ sha256 \"474040ee021cd5df167ef2aa8078f8169d26f6574475170de0f067015aff46a8\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosEndorser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"24ed930b86471a647840b15405d91fa2a7f0215b12196e36a266442e6e5492b1\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosNode < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\n+ sha256 \"f2a1dd65245399ea48f544e37467845445659522dbca01c367f6ec53a59df7c3\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosSandbox < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\n+ sha256 \"d6ed3d403243b29d8b55534d2258abc83a3fdecc656f87da24dd9b2c1a8b00ae\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosSigner < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\n+ sha256 \"8a0dc41a239c0acd6b0cf8456b48cf2c39a40cbf1fcc93c013bf5b83198e9471\" => :catalina\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add catalina bottles hashes
Problem: MacOS users don't want to build Tezos from scratch.
Solution: Provide bottles with Tezos binaries for MacOS Catalina.
|
603,652
|
12.02.2021 11:01:43
| -10,800
|
d192e5c1cb14f089a2e11dfca6b6459555286e9b
|
Resurrect v8.2 native packaging
Problem: PR to opam-repository was merged. CI now should be capable of
checking native packaging.
Solution: Uncomment CI steps related to native packaging.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -69,51 +69,50 @@ steps:\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\nbranches: \"!master\"\n- # TODO: Uncomment once https://github.com/ocaml/opam-repository/pull/18133 is merged\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: 30\n- # agents:\n- # queue: \"docker\"\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-007-PsDELPH1\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- # - 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: 30\n- # agents:\n- # queue: \"docker\"\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-007-PsDELPH1\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+ - 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: 30\n+ agents:\n+ queue: \"docker\"\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-007-PsDELPH1\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+ - 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: 30\n+ agents:\n+ queue: \"docker\"\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-007-PsDELPH1\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- wait\n- label: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Resurrect v8.2 native packaging
Problem: PR to opam-repository was merged. CI now should be capable of
checking native packaging.
Solution: Uncomment CI steps related to native packaging.
|
603,652
|
12.02.2021 17:52:34
| -10,800
|
059f57bf1dcb462640bed60796bca1264319d3c2
|
Add mojave bottles hashes
Problem: MacOS users don't want to build Tezos from scratch.
Solution: Provide bottles with Tezos binaries for MacOS Mojave.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosAccuser007Psdelph1 < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser007Psdelph1.version}/\"\ncellar :any\nsha256 \"de6b8c02b8dffd110acd290a451e2a351e9f37b173eac22f4963a0b7bc3913ea\" => :catalina\n+ sha256 \"fd1c2993b4836bed3b26006dd86db50b603ccd1c9f38cbb486a52d3c473a35dd\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosAccuser008Ptedo2zk < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"c5e5e21e6413c8a669ae1febedbaf294814cb98bb27f43b16d8e02ff11b82f21\" => :catalina\n+ sha256 \"3c949e4a73f233f067dce4c5c99ea0b7717b4009eaed2a39b0db0f576c4c3982\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosAdminClient < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\nsha256 \"c960611dff0c7a3c0be44f7f56c555a722bf4bc905cb6ba9dbd7bbcb7218d6c2\" => :catalina\n+ sha256 \"ee448cf224e05593ff8fb65188ec8df19a98e3161be96c392719779322a32c2f\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"new_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosBaker007Psdelph1 < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker007Psdelph1.version}/\"\ncellar :any\nsha256 \"c915cc5827546a2f2842b7904d17e6a962a3a16fbe019a2cf50335fb7fb91b18\" => :catalina\n+ sha256 \"381aee11b3c9019c0dabd32b57fd0015dee97682855af22feaf42cb208d9d083\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosBaker008Ptedo2zk < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"b2a05a2cbed1fc6dfe9bd2025676a3a718fb976fc6d1140e7fa3b691eb72be81\" => :catalina\n+ sha256 \"68e5dc9d352e96b74e855e5cb35c7c83e37e162177d4db85a254db6409464e94\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosClient < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\nsha256 \"2aaddacfbc9328a2b4d4066851c9f073901842bc1a1464f6cc94e0b603066184\" => :catalina\n+ sha256 \"52fd2d0f9789e3321c20f2b2f33478a13f74d0c29621bd76a5867e286dc9c72b\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosCodec < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\nsha256 \"aeab96953b1014aa5009cc89e4919b111a24d33192c452849387721bd030be94\" => :catalina\n+ sha256 \"b623e5bdbdada505839e00dcd39aab7fefc64891a96145748b58bbd21a9621c2\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"new_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosEndorser007Psdelph1 < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser007Psdelph1.version}/\"\ncellar :any\nsha256 \"474040ee021cd5df167ef2aa8078f8169d26f6574475170de0f067015aff46a8\" => :catalina\n+ sha256 \"0a4e9b96898e48bf7c273b309dfde242d84ba230028c7de1de035c3c816de1c4\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosEndorser008Ptedo2zk < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"24ed930b86471a647840b15405d91fa2a7f0215b12196e36a266442e6e5492b1\" => :catalina\n+ sha256 \"f975198e886c0ed637f1917fd0b23670567440b0ef03717daf346a8a7d61a978\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosNode < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\nsha256 \"f2a1dd65245399ea48f544e37467845445659522dbca01c367f6ec53a59df7c3\" => :catalina\n+ sha256 \"793fe3b61d536a0bdad18fc508a74702ab50e1c313cc740d497c6092db56e3ea\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosSandbox < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\nsha256 \"d6ed3d403243b29d8b55534d2258abc83a3fdecc656f87da24dd9b2c1a8b00ae\" => :catalina\n+ sha256 \"05edf9ca4dd841f1e5a364d9eb77f313bd4c55aa85bbf727e4d6202cd5b605e0\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosSigner < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\nsha256 \"8a0dc41a239c0acd6b0cf8456b48cf2c39a40cbf1fcc93c013bf5b83198e9471\" => :catalina\n+ sha256 \"86811a82bdb4140513c831fa160a80bdcf67f12173978879d0d1d7e9632f717b\" => :mojave\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add mojave bottles hashes
Problem: MacOS users don't want to build Tezos from scratch.
Solution: Provide bottles with Tezos binaries for MacOS Mojave.
|
603,666
|
11.11.2020 05:55:05
| 28,800
|
9eefc36263f2d6762f0565fbae2b85438d5d81a3
|
Support custom networks within the node service
Problem: We want to run node in some custom network. A custom network
can be defined via a custom node config file.
Solution: Using a variable CUSTOM_NODE_CONFIG, you can specify the path
to the node configuration file.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -69,19 +69,27 @@ packages = [\n\"A client to decode and encode JSON\")\n]\n-node_units = []\n-for network in networks:\n- env = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\", \"NODE_RPC_ADDR=127.0.0.1:8732\",\n- \"CERT_PATH=\", \"KEY_PATH=\"]\n+\n+def mk_node_unit(suffix, env, desc):\nservice_file = ServiceFile(Unit(after=[\"network.target\"], requires=[],\n- description=f\"Tezos node {network}\"),\n+ description=desc),\nService(environment=env,\nexec_start=\"/usr/bin/tezos-node-start\",\nstate_directory=\"tezos\", user=\"tezos\"\n))\n- node_units.append(SystemdUnit(suffix=network,\n- service_file=service_file,\n- startup_script=\"tezos-node-start\"))\n+ return SystemdUnit(suffix=suffix, service_file=service_file, startup_script=\"tezos-node-start\")\n+\n+\n+node_units = []\n+common_node_env = [\"NODE_RPC_ADDR=127.0.0.1:8732\", \"CERT_PATH=\", \"KEY_PATH=\"]\n+for network in networks:\n+ env = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\"] + common_node_env\n+ node_units.append(mk_node_unit(suffix=network, env=env, desc=f\"Tezos node {network}\"))\n+\n+node_units.append(mk_node_unit(suffix=\"custom\", env=[\"DATA_DIR=/var/lib/tezos/node-custom\",\n+ \"CUSTOM_NODE_CONFIG=\"] + common_node_env,\n+ desc=\"Tezos node with custom config\"))\n+\npackages.append(Package(\"tezos-node\",\n\"Entry point for initializing, configuring and running a Tezos node\",\nnode_units,\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-start",
"new_path": "docker/package/scripts/tezos-node-start",
"diff": "set -euo pipefail\nnode=\"/usr/bin/tezos-node\"\n+# default location of the config file\n+config_file=\"$DATA_DIR/config.json\"\nmkdir -p \"$DATA_DIR\"\n-if [ ! -f \"$DATA_DIR/config.json\" ]; then\n+# CUSTOM_NODE_CONFIG can be provided in the tezos-node-custom.service environment\n+if [[ -z \"${CUSTOM_NODE_CONFIG:-}\" ]]; then\n+ if [[ ! -f \"$config_file\" ]]; then\necho \"Configuring the node...\"\n\"$node\" config init \\\n--data-dir \"$DATA_DIR\" \\\n@@ -24,11 +28,16 @@ else\n--network \"$NETWORK\"\n\"$@\"\nfi\n+else\n+ echo \"Run using custom node config file\"\n+ config_file=\"$CUSTOM_NODE_CONFIG\"\n+fi\n# Launching the node\nif [[ -z \"$CERT_PATH\" || -z \"$KEY_PATH\" ]]; then\n- exec \"$node\" run --data-dir \"$DATA_DIR\"\n+ exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\"\nelse\n- exec \"$node\" run --data-dir \"$DATA_DIR\" --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\n+ exec \"$node\" run --data-dir \"$DATA_DIR\" --config-file=\"$config_file\" \\\n+ --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\nfi\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#99] Support custom networks within the node service
Problem: We want to run node in some custom network. A custom network
can be defined via a custom node config file.
Solution: Using a variable CUSTOM_NODE_CONFIG, you can specify the path
to the node configuration file.
|
603,652
|
16.02.2021 14:44:26
| -10,800
|
e40e6e79cb0ab0eed2e235c1138cbfb80926f4fd
|
Use new package as a dependency
Problem: Sapling params are requied for `tezos-client`, `tezos-node`,
and `tezos-baker-008` usage.
Solution: Use `tezos-sapling-params` as a dependency for the
aformentioned packages.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -74,12 +74,14 @@ fedora_epoch = 1\nclass OpamBasedPackage(AbstractPackage):\ndef __init__(self, name: str, desc: str, systemd_units: List[SystemdUnit]=[],\n- target_proto: str=None, optional_opam_deps=[]):\n+ target_proto: str=None, optional_opam_deps: List[str]=[],\n+ requires_sapling_params: bool=False):\nself.name = name\nself.desc = desc\nself.systemd_units = systemd_units\nself.target_proto = target_proto\nself.optional_opam_deps = optional_opam_deps\n+ self.requires_sapling_params = requires_sapling_params\ndef fetch_sources(self, out_dir):\nopam_package = \"tezos-client\" if self.name == \"tezos-admin-client\" else self.name\n@@ -102,7 +104,7 @@ Homepage: https://gitlab.com/tezos/tezos/\nPackage: {self.name.lower()}\nArchitecture: amd64\n-Depends: ${{shlibs:Depends}}, ${{misc:Depends}}\n+Depends: ${{shlibs:Depends}}, ${{misc:Depends}}, {\"tezos-sapling-params\" if self.requires_sapling_params else \"\"}\nDescription: {self.desc}\n'''\nwith open(out, 'w') as f:\n@@ -196,7 +198,7 @@ BuildArch: x86_64\nSource0: {self.name}-{version}.tar.gz\nSource1: https://gitlab.com/tezos/tezos/tree/v{version}/\nBuildRequires: {build_requires} {systemd_deps}\n-Requires: {requires}\n+Requires: {requires}, {\"tezos-sapling-params\" if self.requires_sapling_params else \"\"}\n%description\n{self.desc}\nMaintainer: {meta['maintainer']}\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -57,7 +57,8 @@ signer_units = [\npackages = [\nOpamBasedPackage(\"tezos-client\",\n\"CLI client for interacting with tezos blockchain\",\n- optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]),\n+ optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"],\n+ requires_sapling_params=True),\nOpamBasedPackage(\"tezos-admin-client\",\n\"Administration tool for the node\",\noptional_opam_deps=[\"tls\"]),\n@@ -91,6 +92,7 @@ node_units.append(mk_node_unit(suffix=\"custom\", env=[\"DATA_DIR=/var/lib/tezos/no\ndesc=\"Tezos node with custom config\"))\npackages.append(OpamBasedPackage(\"tezos-node\",\n+ \"Entry point for initializing, configuring and running a Tezos node\",\nnode_units,\noptional_opam_deps=[\n\"tezos-embedded-protocol-001-PtCJ7pwo\",\n@@ -99,7 +101,8 @@ packages.append(OpamBasedPackage(\"tezos-node\",\n\"tezos-embedded-protocol-004-Pt24m4xi\",\n\"tezos-embedded-protocol-005-PsBABY5H\",\n\"tezos-embedded-protocol-005-PsBabyM1\",\n- \"tezos-embedded-protocol-006-PsCARTHA\"]))\n+ \"tezos-embedded-protocol-006-PsCARTHA\"],\n+ requires_sapling_params=True))\nactive_protocols = json.load(open(f\"{os.path.dirname( __file__)}/../../protocols.json\", \"r\"))[\"active\"]\n@@ -140,7 +143,8 @@ for proto in active_protocols:\nstartup_script=\"tezos-baker-start\",\nconfig_file=\"tezos-baker.conf\")],\nproto,\n- optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]))\n+ optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"],\n+ requires_sapling_params=True))\npackages.append(OpamBasedPackage(f\"tezos-accuser-{proto}\", \"Daemon for accusing\",\n[SystemdUnit(service_file=service_file_accuser,\nstartup_script=\"tezos-accuser-start\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#132] Use new package as a dependency
Problem: Sapling params are requied for `tezos-client`, `tezos-node`,
and `tezos-baker-008` usage.
Solution: Use `tezos-sapling-params` as a dependency for the
aformentioned packages.
|
603,652
|
17.02.2021 11:31:59
| -10,800
|
8fad125271800b984991daff12582e4530a29ea6
|
Add postinstallation scripts
Problem: We want users and default data directories to be created
automatically along with the package installation.
Solution: Add scripts that do that in the package postinstallation
stage.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -64,6 +64,10 @@ class AbstractPackage:\ndef gen_install(self, out):\npass\n+ @abstractmethod\n+ def gen_postinst(self, out):\n+ pass\n+\nmeta = json.load(open(f\"{os.path.dirname(__file__)}/../../meta.json\", \"r\"))\nversion = os.environ[\"TEZOS_VERSION\"][1:]\n@@ -75,13 +79,14 @@ fedora_epoch = 1\nclass OpamBasedPackage(AbstractPackage):\ndef __init__(self, name: str, desc: str, systemd_units: List[SystemdUnit]=[],\ntarget_proto: str=None, optional_opam_deps: List[str]=[],\n- requires_sapling_params: bool=False):\n+ requires_sapling_params: bool=False, postinst_steps: str=\"\"):\nself.name = name\nself.desc = desc\nself.systemd_units = systemd_units\nself.target_proto = target_proto\nself.optional_opam_deps = optional_opam_deps\nself.requires_sapling_params = requires_sapling_params\n+ self.postinst_steps = postinst_steps\ndef fetch_sources(self, out_dir):\nopam_package = \"tezos-client\" if self.name == \"tezos-admin-client\" else self.name\n@@ -171,8 +176,8 @@ mkdir -p %{{buildroot}}/%{{_unitdir}}\nsystemd_macros= f'''\n%post\n{systemd_units_post}\n-useradd tezos -d /var/lib/tezos || true\n{enable_units}\n+{self.postinst_steps}\n%preun\n{systemd_units_preun}\n@@ -267,6 +272,15 @@ override_dh_systemd_start:\nwith open(out, 'w') as f:\nf.write(install_contents)\n+ def gen_postinst(self, out):\n+ postinst_contents = f'''#!/bin/sh\n+\n+set -e\n+{self.postinst_steps}\n+'''\n+ with open(out, 'w') as f:\n+ f.write(postinst_contents)\n+\nclass TezosSaplingParamsPackage(AbstractPackage):\ndef __init__(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -95,6 +95,7 @@ for package in packages:\nf\"debian/{package.name.lower()}-{systemd_unit.suffix}.default\")\nshutil.copy(f\"{os.path.dirname(__file__)}/scripts/{systemd_unit.startup_script}\", f\"debian/{systemd_unit.startup_script}\")\npackage.gen_install(\"debian/install\")\n+ package.gen_postinst(\"debian/postinst\")\npackage.gen_control_file(common_deps, \"debian/control\")\nsubprocess.run([\"wget\", \"-q\", \"-O\", \"debian/copyright\", f\"https://gitlab.com/tezos/tezos/-/raw/v{version}/LICENSE\"], check=True)\nsubprocess.run(\"rm debian/*.ex debian/*.EX debian/README*\", shell=True, check=True)\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -70,6 +70,10 @@ packages = [\n\"A client to decode and encode JSON\")\n]\n+postinst_steps_common = '''\n+useradd --home-dir /var/lib/tezos tezos || true\n+'''\n+\ndef mk_node_unit(suffix, env, desc):\nservice_file = ServiceFile(Unit(after=[\"network.target\"], requires=[],\n@@ -82,14 +86,17 @@ def mk_node_unit(suffix, env, desc):\nnode_units = []\n+node_postinst_steps = \"\"\ncommon_node_env = [\"NODE_RPC_ADDR=127.0.0.1:8732\", \"CERT_PATH=\", \"KEY_PATH=\"]\nfor network in networks:\nenv = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\"] + common_node_env\nnode_units.append(mk_node_unit(suffix=network, env=env, desc=f\"Tezos node {network}\"))\n+ node_postinst_steps += f\"mkdir -p /var/lib/tezos/node-{network}\\n\"\nnode_units.append(mk_node_unit(suffix=\"custom\", env=[\"DATA_DIR=/var/lib/tezos/node-custom\",\n\"CUSTOM_NODE_CONFIG=\"] + common_node_env,\ndesc=\"Tezos node with custom config\"))\n+node_postinst_steps += \"mkdir -p /var/lib/tezos/node-custom\\n\"\npackages.append(OpamBasedPackage(\"tezos-node\",\n\"Entry point for initializing, configuring and running a Tezos node\",\n@@ -102,7 +109,8 @@ packages.append(OpamBasedPackage(\"tezos-node\",\n\"tezos-embedded-protocol-005-PsBABY5H\",\n\"tezos-embedded-protocol-005-PsBabyM1\",\n\"tezos-embedded-protocol-006-PsCARTHA\"],\n- requires_sapling_params=True))\n+ requires_sapling_params=True,\n+ postinst_steps=node_postinst_steps))\nactive_protocols = json.load(open(f\"{os.path.dirname( __file__)}/../../protocols.json\", \"r\"))[\"active\"]\n@@ -144,18 +152,24 @@ for proto in active_protocols:\nconfig_file=\"tezos-baker.conf\")],\nproto,\noptional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"],\n- requires_sapling_params=True))\n+ requires_sapling_params=True,\n+ postinst_steps=postinst_steps_common + '''\n+mkdir -p /var/lib/tezos/baker'''))\npackages.append(OpamBasedPackage(f\"tezos-accuser-{proto}\", \"Daemon for accusing\",\n[SystemdUnit(service_file=service_file_accuser,\nstartup_script=\"tezos-accuser-start\",\nconfig_file=\"tezos-accuser.conf\")],\nproto,\n- optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]))\n+ optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"],\n+ postinst_steps=postinst_steps_common + '''\n+mkdir -p /var/lib/tezos/accuser'''))\npackages.append(OpamBasedPackage(f\"tezos-endorser-{proto}\", \"Daemon for endorsing\",\n[SystemdUnit(service_file=service_file_endorser,\nstartup_script=\"tezos-endorser-start\",\nconfig_file=\"tezos-endorser.conf\")],\nproto,\n- optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"]))\n+ optional_opam_deps=[\"tls\", \"ledgerwallet-tezos\"],\n+ postinst_steps=postinst_steps_common + '''\n+mkdir -p /var/lib/tezos/endorser'''))\npackages.append(TezosSaplingParamsPackage())\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#133] Add postinstallation scripts
Problem: We want users and default data directories to be created
automatically along with the package installation.
Solution: Add scripts that do that in the package postinstallation
stage.
|
603,652
|
19.02.2021 10:09:18
| -10,800
|
3015133aa0b69ef330fcf4f55f8d009106b6ba44
|
Increase OPAMSOLVERTIMEOUT
Problem: opam solver tends to fail with timeout when resolving the
package set for tezos-node opam package.
Solution: Increase timeout once again.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/docker-tezos-packages.sh",
"new_path": "docker/docker-tezos-packages.sh",
"diff": "@@ -47,10 +47,10 @@ done\n\"$virtualisation_engine\" build -t tezos-\"$target_os\" -f docker/package/Dockerfile-\"$target_os\" .\nset +e\nif [[ -z ${source_archive-} ]]; then\n- container_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=120 -t tezos-\"$target_os\" \"${args[@]}\")\"\n+ container_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=240 -t tezos-\"$target_os\" \"${args[@]}\")\"\nelse\ncontainer_id=\"$(\"$virtualisation_engine\" create -v \"$PWD/$source_archive:/tezos-packaging/docker/$source_archive_name\" \\\n- --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=120 -t tezos-\"$target_os\" \"${args[@]}\")\"\n+ --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=240 -t tezos-\"$target_os\" \"${args[@]}\")\"\nfi\n\"$virtualisation_engine\" start -a \"$container_id\"\nexit_code=\"$?\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Increase OPAMSOLVERTIMEOUT
Problem: opam solver tends to fail with timeout when resolving the
package set for tezos-node opam package.
Solution: Increase timeout once again.
|
603,652
|
17.02.2021 18:00:11
| -10,800
|
458f3eb4e0563b2877e0068f6aeb59f1b49b4521
|
Add edo2net node service
Problem: v8.2 tezos-node doesn't have predefined network for edo2net,
which makes it really inconvenient to run a node that uses this new
testnet.
Solution: Add a tezos-node-edo2net service, which uses edo2net config
created during the package installation.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -85,19 +85,53 @@ def mk_node_unit(suffix, env, desc):\nreturn SystemdUnit(suffix=suffix, service_file=service_file, startup_script=\"tezos-node-start\")\n+# v8.2 tezos-node doesn't have predefined config for edo2net, so we're providing\n+# this config to the service manually\n+edo2net_config = '''{\n+\"p2p\": {},\n+\"network\":\n+ { \"genesis\":\n+ { \"timestamp\": \"2021-02-11T14:00:00Z\",\n+ \"block\": \"BLockGenesisGenesisGenesisGenesisGenesisdae8bZxCCxh\",\n+ \"protocol\": \"PtYuensgYBb3G3x1hLLbCmcav8ue8Kyd2khADcL5LsT5R1hcXex\" },\n+ \"genesis_parameters\":\n+ { \"values\":\n+ { \"genesis_pubkey\":\n+ \"edpkugeDwmwuwyyD3Q5enapgEYDxZLtEUFFSrvVwXASQMVEqsvTqWu\" } },\n+ \"chain_name\": \"TEZOS_EDO2NET_2021-02-11T14:00:00Z\",\n+ \"sandboxed_chain_name\": \"SANDBOXED_TEZOS\",\n+ \"default_bootstrap_peers\":\n+ [ \"edonet.tezos.co.il\", \"188.40.128.216:29732\", \"edo2net.kaml.fr\",\n+ \"edonet2.smartpy.io\", \"51.79.165.131\", \"edonetb.boot.tezostaquito.io\" ] }\n+}\n+'''\n+\nnode_units = []\n-node_postinst_steps = \"\"\n+node_postinst_steps = postinst_steps_common\ncommon_node_env = [\"NODE_RPC_ADDR=127.0.0.1:8732\", \"CERT_PATH=\", \"KEY_PATH=\"]\nfor network in networks:\nenv = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\"] + common_node_env\nnode_units.append(mk_node_unit(suffix=network, env=env, desc=f\"Tezos node {network}\"))\nnode_postinst_steps += f\"mkdir -p /var/lib/tezos/node-{network}\\n\"\n+# Add custom config service\nnode_units.append(mk_node_unit(suffix=\"custom\", env=[\"DATA_DIR=/var/lib/tezos/node-custom\",\n\"CUSTOM_NODE_CONFIG=\"] + common_node_env,\ndesc=\"Tezos node with custom config\"))\nnode_postinst_steps += \"mkdir -p /var/lib/tezos/node-custom\\n\"\n+# Add edo2net service\n+node_units.append(mk_node_unit(suffix=\"edo2net\", env=common_node_env + [\"DATA_DIR=/var/lib/tezos/node-edo2net\"],\n+ desc=\"Tezos node edo2net\"))\n+\n+node_postinst_steps += f'''mkdir -p /var/lib/tezos/node-edo2net\n+rm -f /var/lib/tezos/node-edo2net/config.json\n+cat > /var/lib/tezos/node-edo2net/config.json <<- EOM\n+{edo2net_config}\n+EOM\n+chown tezos:tezos /var/lib/tezos/node-edo2net/config.json\n+'''\n+\npackages.append(OpamBasedPackage(\"tezos-node\",\n\"Entry point for initializing, configuring and running a Tezos node\",\nnode_units,\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/scripts/tezos-node-start",
"new_path": "docker/package/scripts/tezos-node-start",
"diff": "@@ -18,14 +18,14 @@ if [[ -z \"${CUSTOM_NODE_CONFIG:-}\" ]]; then\n\"$node\" config init \\\n--data-dir \"$DATA_DIR\" \\\n--rpc-addr \"$NODE_RPC_ADDR\" \\\n- --network \"$NETWORK\"\n+ ${NETWORK:+\"--network=$NETWORK\"} \\\n\"$@\"\nelse\necho \"Updating the node configuration...\"\n\"$node\" config update \\\n--data-dir \"$DATA_DIR\" \\\n--rpc-addr \"$NODE_RPC_ADDR\" \\\n- --network \"$NETWORK\"\n+ ${NETWORK:+\"--network=$NETWORK\"}\n\"$@\"\nfi\nelse\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#144] Add edo2net node service
Problem: v8.2 tezos-node doesn't have predefined network for edo2net,
which makes it really inconvenient to run a node that uses this new
testnet.
Solution: Add a tezos-node-edo2net service, which uses edo2net config
created during the package installation.
|
603,652
|
19.02.2021 10:58:46
| -10,800
|
260737394f4ad270909d0caa2ebebfe85ca2833f
|
Drop obsolete testnets
Problem: delphinet and edonet are now obsolete.
Solution: Remove their support from the tezos-node package.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -5,7 +5,7 @@ import os, shutil, sys, subprocess, json\nfrom .model import Service, ServiceFile, SystemdUnit, Unit, OpamBasedPackage, TezosSaplingParamsPackage\n-networks = [\"mainnet\", \"delphinet\", \"edonet\"]\n+networks = [\"mainnet\"]\nsigner_units = [\nSystemdUnit(\n@@ -156,11 +156,6 @@ daemon_decs = {\n\"endorser\": \"daemon for endorsing\"\n}\n-default_testnets = {\n- \"007-PsDELPH1\": \"delphinet\",\n- \"008-PtEdoTez\": \"edonet\"\n-}\n-\ndaemon_postinst = postinst_steps_common + \"\\nmkdir -p /var/lib/tezos/client\\n\"\nfor proto in active_protocols:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Drop obsolete testnets
Problem: delphinet and edonet are now obsolete.
Solution: Remove their support from the tezos-node package.
|
603,652
|
19.02.2021 10:59:46
| -10,800
|
587faa7230a0b63ca34cee6d761ba9a9b3bdfead
|
Deactivate 007 protocol
Problem: 008 was activated on mainnet and it doesn't make much sense to
support 007 anymore.
Solution: Drop 007 protocol support from the tezos-packaging.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -84,7 +84,7 @@ steps:\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-007-PsDELPH1\n+ - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-008-PtEdo2Zk\n- rm -rf out\n# It takes much time to build binary package, so we do it only on master\nbranches: \"master\"\n@@ -106,7 +106,7 @@ steps:\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-007-PsDELPH1\n+ - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-008-PtEdo2Zk\n- rm -rf out\n# It takes much time to build binary package, so we do it only on master\nbranches: \"master\"\n"
},
{
"change_type": "DELETE",
"old_path": "Formula/tezos-accuser-007-PsDELPH1.rb",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\n-\n-class TezosAccuser007Psdelph1 < Tezos\n- init\n- desc \"Daemon for accusing\"\n-\n- bottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser007Psdelph1.version}/\"\n- cellar :any\n- sha256 \"de6b8c02b8dffd110acd290a451e2a351e9f37b173eac22f4963a0b7bc3913ea\" => :catalina\n- sha256 \"fd1c2993b4836bed3b26006dd86db50b603ccd1c9f38cbb486a52d3c473a35dd\" => :mojave\n- end\n-\n- def install\n- make_deps\n- install_template \"src/proto_007_PsDELPH1/bin_accuser/main_accuser_007_PsDELPH1.exe\",\n- \"_build/default/src/proto_007_PsDELPH1/bin_accuser/main_accuser_007_PsDELPH1.exe\",\n- \"tezos-accuser-007-PsDELPH1\"\n- end\n-end\n"
},
{
"change_type": "DELETE",
"old_path": "Formula/tezos-baker-007-PsDELPH1.rb",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\n-\n-class TezosBaker007Psdelph1 < Tezos\n- init\n- desc \"Daemon for baking\"\n-\n- bottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker007Psdelph1.version}/\"\n- cellar :any\n- sha256 \"c915cc5827546a2f2842b7904d17e6a962a3a16fbe019a2cf50335fb7fb91b18\" => :catalina\n- sha256 \"381aee11b3c9019c0dabd32b57fd0015dee97682855af22feaf42cb208d9d083\" => :mojave\n- end\n-\n- def install\n- make_deps\n- install_template \"src/proto_007_PsDELPH1/bin_baker/main_baker_007_PsDELPH1.exe\",\n- \"_build/default/src/proto_007_PsDELPH1/bin_baker/main_baker_007_PsDELPH1.exe\",\n- \"tezos-baker-007-PsDELPH1\"\n- end\n-end\n"
},
{
"change_type": "DELETE",
"old_path": "Formula/tezos-endorser-007-PsDELPH1.rb",
"new_path": null,
"diff": "-# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: LicenseRef-MIT-TQ\n-\n-require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\n-\n-class TezosEndorser007Psdelph1 < Tezos\n- init\n- desc \"Daemon for endorsing\"\n-\n- bottle do\n- root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser007Psdelph1.version}/\"\n- cellar :any\n- sha256 \"474040ee021cd5df167ef2aa8078f8169d26f6574475170de0f067015aff46a8\" => :catalina\n- sha256 \"0a4e9b96898e48bf7c273b309dfde242d84ba230028c7de1de035c3c816de1c4\" => :mojave\n- end\n-\n- def install\n- make_deps\n- install_template \"src/proto_007_PsDELPH1/bin_endorser/main_endorser_007_PsDELPH1.exe\",\n- \"_build/default/src/proto_007_PsDELPH1/bin_endorser/main_endorser_007_PsDELPH1.exe\",\n- \"tezos-endorser-007-PsDELPH1\"\n- end\n-end\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "\"005-PsBABY5H\",\n\"005-PsBabyM1\",\n\"006-PsCARTHA\",\n+ \"007-PsDELPH1\",\n\"008-PtEdoTez\"\n],\n\"active\": [\n- \"007-PsDELPH1\",\n\"008-PtEdo2Zk\"\n]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tezos-binaries.nix",
"new_path": "tests/tezos-binaries.nix",
"diff": "@@ -17,11 +17,11 @@ 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-007-PsDELPH1\"\n+ tezos_accuser = f\"{path_to_binaries}/tezos-accuser-008-PtEdo2Zk\"\ntezos_admin_client = f\"{path_to_binaries}/tezos-admin-client\"\n- tezos_baker = f\"{path_to_binaries}/tezos-baker-007-PsDELPH1\"\n+ tezos_baker = f\"{path_to_binaries}/tezos-baker-008-PtEdo2Zk\"\ntezos_client = f\"{path_to_binaries}/tezos-client\"\n- tezos_endorser = f\"{path_to_binaries}/tezos-endorser-007-PsDELPH1\"\n+ tezos_endorser = f\"{path_to_binaries}/tezos-endorser-008-PtEdo2Zk\"\ntezos_node = f\"{path_to_binaries}/tezos-node\"\ntezos_signer = f\"{path_to_binaries}/tezos-signer\"\ntezos_codec = f\"{path_to_binaries}/tezos-codec\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Deactivate 007 protocol
Problem: 008 was activated on mainnet and it doesn't make much sense to
support 007 anymore.
Solution: Drop 007 protocol support from the tezos-packaging.
|
603,652
|
19.02.2021 16:38:11
| -10,800
|
93f5d0ac106ed13c2cb6ace552ca93cbb99ecf91
|
Add node config init to postinstall
Problem: Node snapshot import by default assumes that the node directory
targets mainnet, thus it's not possible to import testnet snapshot to
the empty node data directory.
Solution: Add `tezos-node config init` calls for all non-custom network
services to the postinstallation stage.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -112,7 +112,10 @@ common_node_env = [\"NODE_RPC_ADDR=127.0.0.1:8732\", \"CERT_PATH=\", \"KEY_PATH=\"]\nfor network in networks:\nenv = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\"] + common_node_env\nnode_units.append(mk_node_unit(suffix=network, env=env, desc=f\"Tezos node {network}\"))\n- node_postinst_steps += f\"mkdir -p /var/lib/tezos/node-{network}\\n\"\n+ node_postinst_steps += f'''mkdir -p /var/lib/tezos/node-{network}\n+[ ! -f /var/lib/tezos/node-{network}/config.json ] && tezos-node config init --data-dir /var/lib/tezos/node-{network} --network {network}\n+chown -R tezos:tezos /var/lib/tezos/node-{network}\n+'''\n# Add custom config service\nnode_units.append(mk_node_unit(suffix=\"custom\", env=[\"DATA_DIR=/var/lib/tezos/node-custom\",\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#133] Add node config init to postinstall
Problem: Node snapshot import by default assumes that the node directory
targets mainnet, thus it's not possible to import testnet snapshot to
the empty node data directory.
Solution: Add `tezos-node config init` calls for all non-custom network
services to the postinstallation stage.
|
603,652
|
19.02.2021 16:43:27
| -10,800
|
f028fe97cbdbb430593a3c7a9a9ef33582380f42
|
Prepare new release
Problem: We added some additional functionality to the node and daemons
systemd services. Also, we've dropped delphi support.
Solution: Bump release number to provide the update to the users.
Remove bottles brew hashes for now, they'll be updated later after the
release.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosAccuser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"c5e5e21e6413c8a669ae1febedbaf294814cb98bb27f43b16d8e02ff11b82f21\" => :catalina\n- sha256 \"3c949e4a73f233f067dce4c5c99ea0b7717b4009eaed2a39b0db0f576c4c3982\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosAdminClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\n- sha256 \"c960611dff0c7a3c0be44f7f56c555a722bf4bc905cb6ba9dbd7bbcb7218d6c2\" => :catalina\n- sha256 \"ee448cf224e05593ff8fb65188ec8df19a98e3161be96c392719779322a32c2f\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosBaker008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"b2a05a2cbed1fc6dfe9bd2025676a3a718fb976fc6d1140e7fa3b691eb72be81\" => :catalina\n- sha256 \"68e5dc9d352e96b74e855e5cb35c7c83e37e162177d4db85a254db6409464e94\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\n- sha256 \"2aaddacfbc9328a2b4d4066851c9f073901842bc1a1464f6cc94e0b603066184\" => :catalina\n- sha256 \"52fd2d0f9789e3321c20f2b2f33478a13f74d0c29621bd76a5867e286dc9c72b\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosCodec < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\n- sha256 \"aeab96953b1014aa5009cc89e4919b111a24d33192c452849387721bd030be94\" => :catalina\n- sha256 \"b623e5bdbdada505839e00dcd39aab7fefc64891a96145748b58bbd21a9621c2\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosEndorser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"24ed930b86471a647840b15405d91fa2a7f0215b12196e36a266442e6e5492b1\" => :catalina\n- sha256 \"f975198e886c0ed637f1917fd0b23670567440b0ef03717daf346a8a7d61a978\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosNode < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\n- sha256 \"f2a1dd65245399ea48f544e37467845445659522dbca01c367f6ec53a59df7c3\" => :catalina\n- sha256 \"793fe3b61d536a0bdad18fc508a74702ab50e1c313cc740d497c6092db56e3ea\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosSandbox < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\n- sha256 \"d6ed3d403243b29d8b55534d2258abc83a3fdecc656f87da24dd9b2c1a8b00ae\" => :catalina\n- sha256 \"05edf9ca4dd841f1e5a364d9eb77f313bd4c55aa85bbf727e4d6202cd5b605e0\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -11,8 +11,6 @@ class TezosSigner < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\n- sha256 \"8a0dc41a239c0acd6b0cf8456b48cf2c39a40cbf1fcc93c013bf5b83198e9471\" => :catalina\n- sha256 \"86811a82bdb4140513c831fa160a80bdcf67f12173978879d0d1d7e9632f717b\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "FormulaAbstract/tezos.rb",
"new_path": "FormulaAbstract/tezos.rb",
"diff": "@@ -15,7 +15,7 @@ class Tezos < Formula\nurl \"https://gitlab.com/tezos/tezos.git\", :tag => \"v8.2\", :shallow => false\n- version \"v8.2-1\"\n+ version \"v8.2-2\"\nbuild_dependencies = %w[pkg-config autoconf rsync wget opam rust]\nbuild_dependencies.each do |dependency|\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
|
Prepare new release
Problem: We added some additional functionality to the node and daemons
systemd services. Also, we've dropped delphi support.
Solution: Bump release number to provide the update to the users.
Remove bottles brew hashes for now, they'll be updated later after the
release.
|
603,652
|
22.02.2021 13:13:34
| -10,800
|
04b74ef50f613cca47c2b8150c353f9aa9645ce4
|
Add mojave bottles hashes
Problem: We created a new v8.2-2 release.
Solution: Provide mojave bottles hashes.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosAccuser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"13468d11576c613a8003522cfcc4a2249fac6cffbcb7d3ad4fa75b26db0443c0\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosAdminClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\n+ sha256 \"4aba498b66046f28522472e1ec59e89cbeec8dc1ac616595c5e5e4d097ccb2cc\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosBaker008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"610e59b9bfa629fd9dbe296e22ae8009d072101dc350ce61196e0334f8068597\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosClient < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\n+ sha256 \"151a7ac18c105ec2efc4375b65b20671bfc390aca17a657538e3900944c2d238\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosCodec < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\n+ sha256 \"f32315f7ce4cf3ac8f2ca34f1a211c992d89a69b8338275335921ad212d795a0\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosEndorser008Ptedo2zk < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"a8e4e417b2e7a4a75285f68bd1fe4d6616a93c236e1c93ac1776be93c3de361d\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosNode < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\n+ sha256 \"8d8d844eeebb2ddc71ee49819df24d7d563d61a7a959c413ed487b2d79a51c22\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosSandbox < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\n+ sha256 \"7fc301036da8c383feedae58d65fe5eabac199d5c58de9b024f5c58a62797301\" => :mojave\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -11,6 +11,7 @@ class TezosSigner < Tezos\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\n+ sha256 \"13df7e1edca72b3425ea8afb6d5230908e91d7a51d64be55f0c128a51a53c614\" => :mojave\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add mojave bottles hashes
Problem: We created a new v8.2-2 release.
Solution: Provide mojave bottles hashes.
|
603,652
|
23.02.2021 14:08:05
| -10,800
|
065ed6c6679e447264ebdb7eb872404ff8ce2860
|
Add cataline bottles hashes
Problem: We created a new v8.2-2 release.
Solution: Provide catalina bottles hashes.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosAccuser008Ptedo2zk < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"13468d11576c613a8003522cfcc4a2249fac6cffbcb7d3ad4fa75b26db0443c0\" => :mojave\n+ sha256 \"a79420d56a90c7347886b6a4fb2bbbf3c49e58c3abb067f9aaac523144eea619\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosAdminClient < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\nsha256 \"4aba498b66046f28522472e1ec59e89cbeec8dc1ac616595c5e5e4d097ccb2cc\" => :mojave\n+ sha256 \"1735a780e6d090278d7356509778b461fe301d417f76733e491efab24f810a3e\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosBaker008Ptedo2zk < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"610e59b9bfa629fd9dbe296e22ae8009d072101dc350ce61196e0334f8068597\" => :mojave\n+ sha256 \"fa90547bfd8c21c88ba3c26cb931774a0157fcbd169e853935bc322bb5fed064\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosClient < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\nsha256 \"151a7ac18c105ec2efc4375b65b20671bfc390aca17a657538e3900944c2d238\" => :mojave\n+ sha256 \"5e7409d2ac7b7b630692c909721798242179bd0675a85693a7c50baa5453ab28\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosCodec < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\nsha256 \"f32315f7ce4cf3ac8f2ca34f1a211c992d89a69b8338275335921ad212d795a0\" => :mojave\n+ sha256 \"3afdaf5c3aeb83a730b9cb17e10886ccdce4b76327eb6d1b04e3391f37f0b8da\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosEndorser008Ptedo2zk < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\nsha256 \"a8e4e417b2e7a4a75285f68bd1fe4d6616a93c236e1c93ac1776be93c3de361d\" => :mojave\n+ sha256 \"7397cb5980f0c1467fa095eeb0d8d99cbbb5cdf0b843e1f84ffc70d6eb03a902\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosNode < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\nsha256 \"8d8d844eeebb2ddc71ee49819df24d7d563d61a7a959c413ed487b2d79a51c22\" => :mojave\n+ sha256 \"cc54bc8b6232f2066c9cda469bf5815e98e9140ca311ad80d2de6efd90f3779e\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosSandbox < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\nsha256 \"7fc301036da8c383feedae58d65fe5eabac199d5c58de9b024f5c58a62797301\" => :mojave\n+ sha256 \"b95c1223b2fa917ff7bbe1bcd4312033035977d1cf87857b5b62e360779f9e43\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -12,6 +12,7 @@ class TezosSigner < Tezos\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\nsha256 \"13df7e1edca72b3425ea8afb6d5230908e91d7a51d64be55f0c128a51a53c614\" => :mojave\n+ sha256 \"58b7ec819ce51e2ac1af4c7794c7030d5f4b6e7d647216b40e69c6bcc2d155f4\" => :catalina\nend\ndef install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add cataline bottles hashes
Problem: We created a new v8.2-2 release.
Solution: Provide catalina bottles hashes.
|
603,652
|
23.02.2021 18:05:03
| -10,800
|
26f1b0095267130e9b131df034dc89ca7857b881
|
Grant tezos user permissions to data dirs
Problem: Data directories created during the post-installation belong to
the root, thus tezos user doesn't have write access to them.
Solution: chown default data directories during postinst.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -132,7 +132,7 @@ rm -f /var/lib/tezos/node-edo2net/config.json\ncat > /var/lib/tezos/node-edo2net/config.json <<- EOM\n{edo2net_config}\nEOM\n-chown tezos:tezos /var/lib/tezos/node-edo2net/config.json\n+chown -R tezos:tezos /var/lib/tezos/node-edo2net\n'''\npackages.append(OpamBasedPackage(\"tezos-node\",\n@@ -159,7 +159,7 @@ daemon_decs = {\n\"endorser\": \"daemon for endorsing\"\n}\n-daemon_postinst = postinst_steps_common + \"\\nmkdir -p /var/lib/tezos/client\\n\"\n+daemon_postinst = postinst_steps_common + \"\\nmkdir -p /var/lib/tezos/client\\nchown -R tezos:tezos /var/lib/tezos/client\\n\"\nfor proto in active_protocols:\nservice_file_baker = ServiceFile(Unit(after=[\"network.target\"],\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#133] Grant tezos user permissions to data dirs
Problem: Data directories created during the post-installation belong to
the root, thus tezos user doesn't have write access to them.
Solution: chown default data directories during postinst.
|
603,652
|
01.03.2021 11:45:09
| -10,800
|
7c320a898e400e60a77ce3f1897ad055ba56424f
|
Increase OPAMSOLVERTIMEOUT once again
|
[
{
"change_type": "MODIFY",
"old_path": "docker/docker-tezos-packages.sh",
"new_path": "docker/docker-tezos-packages.sh",
"diff": "@@ -47,10 +47,10 @@ done\n\"$virtualisation_engine\" build -t tezos-\"$target_os\" -f docker/package/Dockerfile-\"$target_os\" .\nset +e\nif [[ -z ${source_archive-} ]]; then\n- container_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=240 -t tezos-\"$target_os\" \"${args[@]}\")\"\n+ container_id=\"$(\"$virtualisation_engine\" create --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=900 -t tezos-\"$target_os\" \"${args[@]}\")\"\nelse\ncontainer_id=\"$(\"$virtualisation_engine\" create -v \"$PWD/$source_archive:/tezos-packaging/docker/$source_archive_name\" \\\n- --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=240 -t tezos-\"$target_os\" \"${args[@]}\")\"\n+ --env TEZOS_VERSION=\"$TEZOS_VERSION\" --env OPAMSOLVERTIMEOUT=900 -t tezos-\"$target_os\" \"${args[@]}\")\"\nfi\n\"$virtualisation_engine\" start -a \"$container_id\"\nexit_code=\"$?\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Increase OPAMSOLVERTIMEOUT once again
|
603,652
|
25.02.2021 17:04:14
| -10,800
|
f09966b95e8bf8bb88722bd0c5fc6c4b97501162
|
Add formula with sapling-params
Problem: sapling-params is a runtime dependency for some of the Tezos
binaries. It's inconvinient to download them manually.
Solution: Add formula that downloads them and use it as a dependency in
other formulas.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -6,6 +6,7 @@ require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\nclass TezosBaker008Ptedo2zk < Tezos\ninit\n+ depends_on \"tezos-sapling-params\"\ndesc \"Daemon for baking\"\nbottle do\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -6,6 +6,7 @@ require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\nclass TezosClient < Tezos\ninit\n+ depends_on \"tezos-sapling-params\"\ndesc \"CLI client for interacting with tezos blockchain\"\nbottle do\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -6,6 +6,7 @@ require File.join(File.dirname(__FILE__), \"..\", \"FormulaAbstract\", \"tezos\")\nclass TezosNode < Tezos\ninit\n+ depends_on \"tezos-sapling-params\"\ndesc \"Entry point for initializing, configuring and running a Tezos node\"\nbottle do\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-sapling-params.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosSaplingParams < Formula\n+ url \"https://gitlab.com/tezos/opam-repository.git\", :tag => \"v8.2\"\n+ homepage \"https://github.com/serokell/tezos-packaging\"\n+\n+ version \"v8.2-3\"\n+\n+ desc \"Sapling params required at runtime by the Tezos binaries\"\n+\n+ bottle do\n+ root_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSaplingParams.version}/\"\n+ cellar :any\n+ end\n+\n+ def install\n+ share.mkpath\n+ share.install \"zcash-params\"\n+ end\n+end\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Add formula with sapling-params
Problem: sapling-params is a runtime dependency for some of the Tezos
binaries. It's inconvinient to download them manually.
Solution: Add formula that downloads them and use it as a dependency in
other formulas.
|
603,652
|
25.02.2021 17:18:57
| -10,800
|
1fe1d20173b8d5050b05524cbf367f60e0dc62d3
|
Add Tezos daemons services
Problem: It's convenient to run Tezos daemons in the background.
Solution: Provide launchd services for them.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -49,9 +49,67 @@ class TezosAccuser008Ptedo2zk < Formula\nend\ndef install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ accuser=\"#{bin}/tezos-accuser-008-PtEdo2Zk\"\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-008-PtEdo2Zk-start\", startup_contents)\n+ bin.install \"tezos-accuser-008-PtEdo2Zk-start\"\nmake_deps\ninstall_template \"src/proto_008_PtEdo2Zk/bin_accuser/main_accuser_008_PtEdo2Zk.exe\",\n\"_build/default/src/proto_008_PtEdo2Zk/bin_accuser/main_accuser_008_PtEdo2Zk.exe\",\n\"tezos-accuser-008-PtEdo2Zk\"\nend\n+\n+ plist_options manual: \"tezos-accuser-008-PtEdo2Zk 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-008-PtEdo2Zk-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/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\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -49,9 +49,78 @@ class TezosBaker008Ptedo2zk < Formula\nend\ndef install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ baker=\"#{bin}/tezos-baker-008-PtEdo2Zk\"\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-008-PtEdo2Zk-start\", startup_contents)\n+ bin.install \"tezos-baker-008-PtEdo2Zk-start\"\nmake_deps\ninstall_template \"src/proto_008_PtEdo2Zk/bin_baker/main_baker_008_PtEdo2Zk.exe\",\n\"_build/default/src/proto_008_PtEdo2Zk/bin_baker/main_baker_008_PtEdo2Zk.exe\",\n\"tezos-baker-008-PtEdo2Zk\"\nend\n+ plist_options manual: \"tezos-baker-008-PtEdo2Zk 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-008-PtEdo2Zk-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/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\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -51,9 +51,77 @@ class TezosEndorser008Ptedo2zk < Formula\ndef install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ endorser=\"#{bin}/tezos-endorser-008-PtEdo2Zk\"\n+\n+ endorser_dir=\"$DATA_DIR\"\n+\n+ endorser_config=\"$endorser_dir/config\"\n+ mkdir -p \"$endorser_dir\"\n+\n+ if [ ! -f \"$endorser_config\" ]; then\n+ \"$endorser\" --base-dir \"$endorser_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ config init --output \"$endorser_config\" >/dev/null 2>&1\n+ else\n+ \"$endorser\" --base-dir \"$endorser_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ config update >/dev/null 2>&1\n+ fi\n+\n+ launch_endorser() {\n+ exec \"$endorser\" --base-dir \"$endorser_dir\" \\\n+ --endpoint \"$NODE_RPC_ENDPOINT\" \\\n+ run \"$@\"\n+ }\n+\n+ if [[ -z \"$ENDORSER_ACCOUNT\" ]]; then\n+ launch_endorser\n+ else\n+ launch_endorser \"$ENDORSER_ACCOUNT\"\n+ fi\n+ EOS\n+ File.write(\"tezos-endorser-008-PtEdo2Zk-start\", startup_contents)\n+ bin.install \"tezos-endorser-008-PtEdo2Zk-start\"\nmake_deps\ninstall_template \"src/proto_008_PtEdo2Zk/bin_endorser/main_endorser_008_PtEdo2Zk.exe\",\n\"_build/default/src/proto_008_PtEdo2Zk/bin_endorser/main_endorser_008_PtEdo2Zk.exe\",\n\"tezos-endorser-008-PtEdo2Zk\"\nend\n+\n+ plist_options manual: \"tezos-endorser-008-PtEdo2Zk 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-endorser-008-PtEdo2Zk-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/tezos/client</string>\n+ <key>NODE_RPC_ENDPOINT</key>\n+ <string>http://localhost:8732</string>\n+ <key>ENDORSER_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\nend\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Add Tezos daemons services
Problem: It's convenient to run Tezos daemons in the background.
Solution: Provide launchd services for them.
|
603,652
|
25.02.2021 17:20:15
| -10,800
|
221cb961a96a1bda0c4f22073f3bff3854467a79
|
Provide background service for tezos-node
Problem: One formula can provide only one service. However, tezos-node
is supposed to provide multiple services: at least one for each network.
Solution: Add formulas for tezos-node-<network> services that depend on
the tezos-node formula.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-node-edo2net.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosNodeEdo2net < Formula\n+ url \"file:///dev/null\"\n+ version \"v8.2-3\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-node\"\n+\n+ desc \"Meta formula that provides backround tezos-node service that runs on edo2net\"\n+\n+ def install\n+ edo2net_config =\n+ <<~EOS\n+{\n+\"p2p\": {},\n+\"network\":\n+ { \"genesis\":\n+ { \"timestamp\": \"2021-02-11T14:00:00Z\",\n+ \"block\": \"BLockGenesisGenesisGenesisGenesisGenesisdae8bZxCCxh\",\n+ \"protocol\": \"PtYuensgYBb3G3x1hLLbCmcav8ue8Kyd2khADcL5LsT5R1hcXex\" },\n+ \"genesis_parameters\":\n+ { \"values\":\n+ { \"genesis_pubkey\":\n+ \"edpkugeDwmwuwyyD3Q5enapgEYDxZLtEUFFSrvVwXASQMVEqsvTqWu\" } },\n+ \"chain_name\": \"TEZOS_EDO2NET_2021-02-11T14:00:00Z\",\n+ \"sandboxed_chain_name\": \"SANDBOXED_TEZOS\",\n+ \"default_bootstrap_peers\":\n+ [ \"edonet.tezos.co.il\", \"188.40.128.216:29732\", \"edo2net.kaml.fr\",\n+ \"edonet2.smartpy.io\", \"51.79.165.131\", \"edonetb.boot.tezostaquito.io\" ] }\n+}\n+ EOS\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+ cat > \"$config_file\" <<-EOM\n+ #{edo2net_config}\n+ EOM\n+ \"$node\" config update \\\n+ --data-dir \"$DATA_DIR\" \\\n+ --rpc-addr \"$NODE_RPC_ADDR\" \\\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+ \"$@\"\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-edo2net-start\", startup_contents)\n+ bin.install \"tezos-node-edo2net-start\"\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-edo2net-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/tezos/node-edo2net</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+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosNodeMainnet < Formula\n+ url \"file:///dev/null\"\n+ version \"v8.2-3\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-node\"\n+\n+ desc \"Meta formula that provides backround tezos-node service that runs on mainnet\"\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=mainnet \\\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=mainnet \\\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-mainnet-start\", startup_contents)\n+ bin.install \"tezos-node-mainnet-start\"\n+ print \"Installing tezos-node-mainnet 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-mainnet-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/tezos/node-mainnet</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+end\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Provide background service for tezos-node
Problem: One formula can provide only one service. However, tezos-node
is supposed to provide multiple services: at least one for each network.
Solution: Add formulas for tezos-node-<network> services that depend on
the tezos-node formula.
|
603,652
|
25.02.2021 17:29:05
| -10,800
|
5bb347e34a4c0b5950ce7e9d55aecb2895b51937
|
Remove bottles hashes
Problem: We'll make new release with formulas that include services.
Solution: Remove v8.2-2 bottles hashes.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosAccuser008Ptedo2zk < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"13468d11576c613a8003522cfcc4a2249fac6cffbcb7d3ad4fa75b26db0443c0\" => :mojave\n- sha256 \"a79420d56a90c7347886b6a4fb2bbbf3c49e58c3abb067f9aaac523144eea619\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\n- sha256 \"4aba498b66046f28522472e1ec59e89cbeec8dc1ac616595c5e5e4d097ccb2cc\" => :mojave\n- sha256 \"1735a780e6d090278d7356509778b461fe301d417f76733e491efab24f810a3e\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosBaker008Ptedo2zk < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"610e59b9bfa629fd9dbe296e22ae8009d072101dc350ce61196e0334f8068597\" => :mojave\n- sha256 \"fa90547bfd8c21c88ba3c26cb931774a0157fcbd169e853935bc322bb5fed064\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\n- sha256 \"151a7ac18c105ec2efc4375b65b20671bfc390aca17a657538e3900944c2d238\" => :mojave\n- sha256 \"5e7409d2ac7b7b630692c909721798242179bd0675a85693a7c50baa5453ab28\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\n- sha256 \"f32315f7ce4cf3ac8f2ca34f1a211c992d89a69b8338275335921ad212d795a0\" => :mojave\n- sha256 \"3afdaf5c3aeb83a730b9cb17e10886ccdce4b76327eb6d1b04e3391f37f0b8da\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -29,8 +29,6 @@ class TezosEndorser008Ptedo2zk < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\n- sha256 \"a8e4e417b2e7a4a75285f68bd1fe4d6616a93c236e1c93ac1776be93c3de361d\" => :mojave\n- sha256 \"7397cb5980f0c1467fa095eeb0d8d99cbbb5cdf0b843e1f84ffc70d6eb03a902\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\n- sha256 \"8d8d844eeebb2ddc71ee49819df24d7d563d61a7a959c413ed487b2d79a51c22\" => :mojave\n- sha256 \"cc54bc8b6232f2066c9cda469bf5815e98e9140ca311ad80d2de6efd90f3779e\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\n- sha256 \"7fc301036da8c383feedae58d65fe5eabac199d5c58de9b024f5c58a62797301\" => :mojave\n- sha256 \"b95c1223b2fa917ff7bbe1bcd4312033035977d1cf87857b5b62e360779f9e43\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -28,8 +28,6 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\n- sha256 \"13df7e1edca72b3425ea8afb6d5230908e91d7a51d64be55f0c128a51a53c614\" => :mojave\n- sha256 \"58b7ec819ce51e2ac1af4c7794c7030d5f4b6e7d647216b40e69c6bcc2d155f4\" => :catalina\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Remove bottles hashes
Problem: We'll make new release with formulas that include services.
Solution: Remove v8.2-2 bottles hashes.
|
603,652
|
26.02.2021 14:56:54
| -10,800
|
f723115f796ff5966820c4e14ed7b2180fd28eec
|
Add signer background services
Problem: One formula can provide only one service. However, tezos-signer
is supposed to provide multiple services using different ways to
communicate with the caller: http, https, tcp and unix socket.
Solution: Add formulas for tezos-signer-* services that depend on
the tezos-signer formula.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-signer-http.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosSignerHttp < Formula\n+ url \"file:///dev/null\"\n+ version \"v8.2-3\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-signer\"\n+\n+ desc \"Meta formula that provides backround tezos-signer service that runs over http\"\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ signer=\"/usr/local/bin/tezos-signer\"\n+\n+ if [[ -n $PIDFILE ]]; then\n+ pid_file_args=(\"--pid-file\" \"$PIDFILE\")\n+ else\n+ pid_file_args=()\n+ fi\n+\n+ if [[ -n $MAGIC_BYTES ]]; then\n+ magic_bytes_args=(\"--magic-bytes\" \"$MAGIC_BYTES\")\n+ else\n+ magic_bytes_args=()\n+ fi\n+\n+ if [[ -n $CHECK_HIGH_WATERMARK ]]; then\n+ check_high_watermark_args=(\"--check-high-watermark\")\n+ else\n+ check_high_watermark_args=()\n+ fi\n+\n+ \"$signer\" -d \"$DATA_DIR\" launch http signer --address \"$ADDRESS\" --port \"$PORT\" \\\n+ ${pid_file_args[@]+\"${pid_file_args[@]}\"} ${magic_bytes_args[@]+\"${magic_bytes_args[@]}\"} \\\n+ ${check_high_watermark_args[@]+\"${check_high_watermark_args[@]}\"} \"$@\"\n+ EOS\n+ File.write(\"tezos-signer-http-start\", startup_contents)\n+ bin.install \"tezos-signer-http-start\"\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-signer-http-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>ADDRESS</key>\n+ <string>127.0.0.1</string>\n+ <key>PORT</key>\n+ <string>8080</string>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/tezos/signer-http</string>\n+ <key>PIDFILE</key>\n+ <string></string>\n+ <key>MAGIC_BYTES</key>\n+ <string></string>\n+ <key>CHECK_HIGH_WATERMARK</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+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-signer-https.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosSignerHttps < Formula\n+ url \"file:///dev/null\"\n+ version \"v8.2-3\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-signer\"\n+\n+ desc \"Meta formula that provides backround tezos-signer service that runs over https\"\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ signer=\"/usr/local/bin/tezos-signer\"\n+\n+ if [[ -n $PIDFILE ]]; then\n+ pid_file_args=(\"--pid-file\" \"$PIDFILE\")\n+ else\n+ pid_file_args=()\n+ fi\n+\n+ if [[ -n $MAGIC_BYTES ]]; then\n+ magic_bytes_args=(\"--magic-bytes\" \"$MAGIC_BYTES\")\n+ else\n+ magic_bytes_args=()\n+ fi\n+\n+ if [[ -n $CHECK_HIGH_WATERMARK ]]; then\n+ check_high_watermark_args=(\"--check-high-watermark\")\n+ else\n+ check_high_watermark_args=()\n+ fi\n+\n+ \"$signer\" -d \"$DATA_DIR\" launch https signer \"$CERT_PATH\" \"$KEY_PATH\" --address \"$ADDRESS\" --port \"$PORT\" \\\n+ ${pid_file_args[@]+\"${pid_file_args[@]}\"} ${magic_bytes_args[@]+\"${magic_bytes_args[@]}\"} \\\n+ ${check_high_watermark_args[@]+\"${check_high_watermark_args[@]}\"} \"$@\"\n+ EOS\n+ File.write(\"tezos-signer-https-start\", startup_contents)\n+ bin.install \"tezos-signer-https-start\"\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-signer-https-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>ADDRESS</key>\n+ <string>127.0.0.1</string>\n+ <key>PORT</key>\n+ <string>8080</string>\n+ <key>CERT_PATH</key>\n+ <string></string>\n+ <key>KEY_PATH</key>\n+ <string></string>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/tezos/signer-https</string>\n+ <key>PIDFILE</key>\n+ <string></string>\n+ <key>MAGIC_BYTES</key>\n+ <string></string>\n+ <key>CHECK_HIGH_WATERMARK</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+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosSignerTcp < Formula\n+ url \"file:///dev/null\"\n+ version \"v8.2-3\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-signer\"\n+\n+ desc \"Meta formula that provides backround tezos-signer service that runs over tcp socket\"\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ signer=\"/usr/local/bin/tezos-signer\"\n+\n+ if [[ -n $PIDFILE ]]; then\n+ pid_file_args=(\"--pid-file\" \"$PIDFILE\")\n+ else\n+ pid_file_args=()\n+ fi\n+\n+ if [[ -n $MAGIC_BYTES ]]; then\n+ magic_bytes_args=(\"--magic-bytes\" \"$MAGIC_BYTES\")\n+ else\n+ magic_bytes_args=()\n+ fi\n+\n+ if [[ -n $CHECK_HIGH_WATERMARK ]]; then\n+ check_high_watermark_args=(\"--check-high-watermark\")\n+ else\n+ check_high_watermark_args=()\n+ fi\n+\n+ \"$signer\" -d \"$DATA_DIR\" launch socket signer --address \"$ADDRESS\" --port \"$PORT\" --timeout \"$TIMEOUT\" \\\n+ ${pid_file_args[@]+\"${pid_file_args[@]}\"} ${magic_bytes_args[@]+\"${magic_bytes_args[@]}\"} \\\n+ ${check_high_watermark_args[@]+\"${check_high_watermark_args[@]}\"} \"$@\"\n+ EOS\n+ File.write(\"tezos-signer-tcp-start\", startup_contents)\n+ bin.install \"tezos-signer-tcp-start\"\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-signer-tcp-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>ADDRESS</key>\n+ <string>127.0.0.1</string>\n+ <key>PORT</key>\n+ <string>8000</string>\n+ <key>TIMEOUT</key>\n+ <string>1</string>\n+ <key>DATA_DIR</key>\n+ <string>#{ENV[\"HOME\"]}/tezos/signer-tcp</string>\n+ <key>PIDFILE</key>\n+ <string></string>\n+ <key>MAGIC_BYTES</key>\n+ <string></string>\n+ <key>CHECK_HIGH_WATERMARK</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+end\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "+# SPDX-FileCopyrightText: 2021 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: LicenseRef-MIT-TQ\n+\n+class TezosSignerUnix < Formula\n+ url \"file:///dev/null\"\n+ version \"v8.2-3\"\n+\n+ bottle :unneeded\n+ depends_on \"tezos-signer\"\n+\n+ desc \"Meta formula that provides backround tezos-signer service that runs over unix socket\"\n+\n+ def install\n+ startup_contents =\n+ <<~EOS\n+ #!/usr/bin/env bash\n+\n+ set -euo pipefail\n+\n+ signer=\"/usr/local/bin/tezos-signer\"\n+\n+ if [[ -n $PIDFILE ]]; then\n+ pid_file_args=(\"--pid-file\" \"$PIDFILE\")\n+ else\n+ pid_file_args=()\n+ fi\n+\n+ if [[ -n $MAGIC_BYTES ]]; then\n+ magic_bytes_args=(\"--magic-bytes\" \"$MAGIC_BYTES\")\n+ else\n+ magic_bytes_args=()\n+ fi\n+\n+ if [[ -n $CHECK_HIGH_WATERMARK ]]; then\n+ check_high_watermark_args=(\"--check-high-watermark\")\n+ else\n+ check_high_watermark_args=()\n+ fi\n+\n+ \"$signer\" -d \"$DATA_DIR\" launch local signer --socket \"$SOCKET\" \\\n+ ${pid_file_args[@]+\"${pid_file_args[@]}\"} ${magic_bytes_args[@]+\"${magic_bytes_args[@]}\"} \\\n+ ${check_high_watermark_args[@]+\"${check_high_watermark_args[@]}\"} \"$@\"\n+ EOS\n+ File.write(\"tezos-signer-http-start\", startup_contents)\n+ bin.install \"tezos-signer-http-start\"\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-signer-unix-start</string>\n+ <key>EnvironmentVariables</key>\n+ <dict>\n+ <key>SOCKET</key>\n+ <string></string>\n+ <string>#{ENV[\"HOME\"]}/tezos/signer-unix</string>\n+ <key>PIDFILE</key>\n+ <string></string>\n+ <key>MAGIC_BYTES</key>\n+ <string></string>\n+ <key>CHECK_HIGH_WATERMARK</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+end\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Add signer background services
Problem: One formula can provide only one service. However, tezos-signer
is supposed to provide multiple services using different ways to
communicate with the caller: http, https, tcp and unix socket.
Solution: Add formulas for tezos-signer-* services that depend on
the tezos-signer formula.
|
603,652
|
26.02.2021 15:13:21
| -10,800
|
8708f2d8f2ff0e9d8e98479a5738e04dc9d2a228
|
Update README
Problem: Now we provide backround brew services for macOS. Users should
know how to use them.
Solution: Add section about brew services to the README.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -118,7 +118,7 @@ dependencies are compiled from scratch. Once the bottles are built, the correspo\nformulas should be updated. Also, bottles should be uploaded to the release artifacts.\n<a name=\"systemd\"></a>\n-## Systemd units for `tezos-node` and daemons\n+## Background services for `tezos-node` and daemons\n### Systemd units on Ubuntu or Fedora\n@@ -146,7 +146,37 @@ data directory.\n`tezos-{accuser, endorser}` have configurable node address, so that they can be used with both\nremote and local node.\n-### Systemd units on other systems\n+### Launchd services on macOS\n+\n+`tezos-accuser-<proto>`, `tezos-baker-<proto>`, `tezos-endorser-<proto>` formulas\n+provide backround services for running the corresponding daemons.\n+\n+Since `tezos-node` and `tezos-signer` need multiple services they are provided\n+in dedicated meta-formulas. These formulas don't install any binaries and only add\n+background services.\n+\n+Formulas with `tezos-node` background services:\n+* `tezos-node-mainnet`\n+* `tezos-node-edo2net`\n+\n+Formulas with `tezos-signer` background services:\n+* `tezos-signer-http`\n+* `tezos-signer-https`\n+* `tesos-signer-tcp`\n+* `tezos-signer-unix`\n+\n+To start the service: `brew services start <formula>`.\n+\n+To stop the service: `brew services stop <formula>`.\n+\n+All of the brew services have various configurable env variables. These variables\n+can be changed in the corresponding `/usr/local/Cellar/tezos-signer-tcp/<version>/homebrew.mxcl.<formula>.plist`.\n+Once the configuration is updated, you should restart the service:\n+`brew services restart <formula>`.\n+\n+Note, that all services are run as a user agents, thus they're stopped after the logout.\n+\n+### Systemd units on other Linux systems\nIf you're not using Ubuntu or Fedora you can still construct systemd units for binaries\nfrom scratch.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Update README
Problem: Now we provide backround brew services for macOS. Users should
know how to use them.
Solution: Add section about brew services to the README.
|
603,652
|
01.03.2021 15:58:58
| -10,800
|
0d1be7b587cacb40b36b28fbe25d494d125f3346
|
Rework formula validation
Problem: Now some formulas depend on the others and approach with
running `brew info` doesn't work anymore.
Solution: Check that formulas at least have valid ruby code instead.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -52,7 +52,7 @@ steps:\n- label: check brew formulas\ncommands:\n# Check all formulas except 'tezos.rb' because it's a base class for all other formulas\n- - find ./Formula -type f ! -name \"tezos.rb\" -name \"*.rb\" -exec brew info {} +\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"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Rework formula validation
Problem: Now some formulas depend on the others and approach with
running `brew info` doesn't work anymore.
Solution: Check that formulas at least have valid ruby code instead.
|
603,652
|
02.03.2021 10:22:51
| -10,800
|
4115ebdc924bdf0ba84ad06462e466ebf9da3e29
|
Change default data dirs
Problem: brew is incapable of creating and updating directories that are
not in the `HOMEBREW_PREFIX` during install and post-install.
Solution: Move data directories to `/usr/local/var/lib/tezos`.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -97,7 +97,7 @@ class TezosAccuser008Ptedo2zk < Formula\n<key>EnvironmentVariables</key>\n<dict>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/client</string>\n+ <string>#{var}/lib/tezos/client</string>\n<key>NODE_RPC_ENDPOINT</key>\n<string>http://localhost:8732</string>\n</dict>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -104,7 +104,7 @@ class TezosBaker008Ptedo2zk < Formula\n<key>EnvironmentVariables</key>\n<dict>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/client</string>\n+ <string>#{var}/lib/tezos/client</string>\n<key>NODE_DATA_DIR</key>\n<string></string>\n<key>NODE_RPC_ENDPOINT</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -107,7 +107,7 @@ class TezosEndorser008Ptedo2zk < Formula\n<key>EnvironmentVariables</key>\n<dict>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/client</string>\n+ <string>#{var}/lib/tezos/client</string>\n<key>NODE_RPC_ENDPOINT</key>\n<string>http://localhost:8732</string>\n<key>ENDORSER_ACCOUNT</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-edo2net.rb",
"new_path": "Formula/tezos-node-edo2net.rb",
"diff": "@@ -85,7 +85,7 @@ class TezosNodeEdo2net < Formula\n<key>EnvironmentVariables</key>\n<dict>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/node-edo2net</string>\n+ <string>#{var}/lib/tezos/node-edo2net</string>\n<key>NODE_RPC_ADDR</key>\n<string>127.0.0.1:8732</string>\n<key>CERT_PATH</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "@@ -65,7 +65,7 @@ class TezosNodeMainnet < Formula\n<key>EnvironmentVariables</key>\n<dict>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/node-mainnet</string>\n+ <string>#{var}/lib/tezos/node-mainnet</string>\n<key>NODE_RPC_ADDR</key>\n<string>127.0.0.1:8732</string>\n<key>CERT_PATH</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "@@ -63,7 +63,7 @@ class TezosSignerHttp < Formula\n<key>PORT</key>\n<string>8080</string>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/signer-http</string>\n+ <string>#{var}/lib/tezos/signer-http</string>\n<key>PIDFILE</key>\n<string></string>\n<key>MAGIC_BYTES</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "@@ -67,7 +67,7 @@ class TezosSignerHttps < Formula\n<key>KEY_PATH</key>\n<string></string>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/signer-https</string>\n+ <string>#{var}/lib/tezos/signer-https</string>\n<key>PIDFILE</key>\n<string></string>\n<key>MAGIC_BYTES</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "@@ -65,7 +65,7 @@ class TezosSignerTcp < Formula\n<key>TIMEOUT</key>\n<string>1</string>\n<key>DATA_DIR</key>\n- <string>#{ENV[\"HOME\"]}/tezos/signer-tcp</string>\n+ <string>#{var}/lib/tezos/signer-tcp</string>\n<key>PIDFILE</key>\n<string></string>\n<key>MAGIC_BYTES</key>\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "@@ -60,7 +60,7 @@ class TezosSignerUnix < Formula\n<dict>\n<key>SOCKET</key>\n<string></string>\n- <string>#{ENV[\"HOME\"]}/tezos/signer-unix</string>\n+ <string>#{var}/lib/tezos/signer-unix</string>\n<key>PIDFILE</key>\n<string></string>\n<key>MAGIC_BYTES</key>\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Change default data dirs
Problem: brew is incapable of creating and updating directories that are
not in the `HOMEBREW_PREFIX` during install and post-install.
Solution: Move data directories to `/usr/local/var/lib/tezos`.
|
603,652
|
02.03.2021 10:30:37
| -10,800
|
20642286b350ab61b660b4f37f6ac57055582c43
|
Add formulas post-installs
Problem: We want to create default data directories and init node
configs during the postinstall stage.
Solution: Add corresponding post_install to the formulas that provide
brew services.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -110,4 +110,7 @@ class TezosAccuser008Ptedo2zk < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/client\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -121,4 +121,7 @@ class TezosBaker008Ptedo2zk < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/client\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -122,4 +122,7 @@ class TezosEndorser008Ptedo2zk < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/client\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-edo2net.rb",
"new_path": "Formula/tezos-node-edo2net.rb",
"diff": "@@ -11,8 +11,7 @@ class TezosNodeEdo2net < Formula\ndesc \"Meta formula that provides backround tezos-node service that runs on edo2net\"\n- def install\n- edo2net_config =\n+ @@edo2net_config =\n<<~EOS\n{\n\"p2p\": {},\n@@ -32,6 +31,7 @@ class TezosNodeEdo2net < Formula\n\"edonet2.smartpy.io\", \"51.79.165.131\", \"edonetb.boot.tezostaquito.io\" ] }\n}\nEOS\n+ def install\nstartup_contents =\n<<~EOS\n#!/usr/bin/env bash\n@@ -46,7 +46,7 @@ class TezosNodeEdo2net < Formula\nif [[ ! -f \"$config_file\" ]]; then\necho \"Configuring the node...\"\ncat > \"$config_file\" <<-EOM\n- #{edo2net_config}\n+ #{@@edo2net_config}\nEOM\n\"$node\" config update \\\n--data-dir \"$DATA_DIR\" \\\n@@ -102,4 +102,8 @@ class TezosNodeEdo2net < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/node-edo2net\"\n+ File.write(\"#{var}/lib/tezos/node-edo2net/config.json\", @@edo2net_config)\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node-mainnet.rb",
"new_path": "Formula/tezos-node-mainnet.rb",
"diff": "@@ -82,4 +82,8 @@ class TezosNodeMainnet < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir_p \"#{var}/lib/tezos/node-mainnet\"\n+ system \"tezos-node\", \"config\", \"init\", \"--data-dir\" \"#{var}/lib/tezos/node-mainnet\", \"--network\", \"mainnet\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-http.rb",
"new_path": "Formula/tezos-signer-http.rb",
"diff": "@@ -80,4 +80,7 @@ class TezosSignerHttp < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/signer-http\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-https.rb",
"new_path": "Formula/tezos-signer-https.rb",
"diff": "@@ -84,4 +84,7 @@ class TezosSignerHttps < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/signer-https\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-tcp.rb",
"new_path": "Formula/tezos-signer-tcp.rb",
"diff": "@@ -82,4 +82,7 @@ class TezosSignerTcp < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/signer-tcp\"\n+ end\nend\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer-unix.rb",
"new_path": "Formula/tezos-signer-unix.rb",
"diff": "@@ -77,4 +77,7 @@ class TezosSignerUnix < Formula\n</plist>\nEOS\nend\n+ def post_install\n+ mkdir \"#{var}/lib/tezos/signer-unix\"\n+ end\nend\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#130] Add formulas post-installs
Problem: We want to create default data directories and init node
configs during the postinstall stage.
Solution: Add corresponding post_install to the formulas that provide
brew services.
|
603,652
|
03.03.2021 11:40:09
| -10,800
|
a507300a992070611169e86653e5852f678beec8
|
Update README
Problem: Currently it's quite hard to find the article.
Though, we have a plan to publish link to this article somewhere.
Solution: Add one more section to the main README that links to the
article.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -35,6 +35,7 @@ different networks, you can read more about this in [this article](https://tezos\n* [Brew tap for macOS](#macos)\n* [Systemd services for Tezos binaries](#systemd)\n* [Building instructions](#building)\n+* [Setting up baking instance on Ubuntu](#baking-on-ubuntu)\n<a name=\"static-linux\"></a>\n## Obtain binaries from github release\n@@ -239,6 +240,12 @@ 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+<a name=\"baking-on-ubuntu\"></a>\n+## Setting up baking instance on Ubuntu\n+\n+Read [the article](./docs/baking.md) to find out an easy way to set up\n+baking instance on Ubuntu using packages provided by our launchpad PPA.\n+\n## For Contributors\nPlease see [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more information.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#125] Update README
Problem: Currently it's quite hard to find the article.
Though, we have a plan to publish link to this article somewhere.
Solution: Add one more section to the main README that links to the
article.
|
603,652
|
11.03.2021 19:42:42
| -10,800
|
2ba6bc6f350527500cbe78ff02ce45e04c1c379a
|
Update bottles hashes
Problem: New release was created, brew formulas now have
tezos-sapling-params dependency and also provide background services.
We should provide an easy way to obtain updated packages without
building them from scratch.
Solution: Provide hashes for the new bottles.
|
[
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-accuser-008-PtEdo2Zk.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosAccuser008Ptedo2zk < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"4efaedef768f5114ae6e142aeba62c883e1703bcaf725a9c53cceee0f55c4427\" => :mojave\n+ sha256 \"12378615cf0f6291e89f58e8c6aa04aef56d52d823dcab18bb72d954fb7e4b73\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-admin-client.rb",
"new_path": "Formula/tezos-admin-client.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosAdminClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/\"\ncellar :any\n+ sha256 \"dc851c99e9056ca0cad7867057a2fc87dce25936a1017e2cabc31009f69414b9\" => :mojave\n+ sha256 \"d90e59edf2345bb905c5c2f1969a69435eb7d61c0805e56f18874dd88826ef50\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-baker-008-PtEdo2Zk.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosBaker008Ptedo2zk < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"774db0d3db3ac06dc6eb7216b0be9cbde36adf37c6706894b44b232d067bbb5e\" => :mojave\n+ sha256 \"d02f82402146a961b3a055aa8e59d4e87d44d086bd6d3ad6bebb47b98a3d0e76\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-client.rb",
"new_path": "Formula/tezos-client.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosClient < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/\"\ncellar :any\n+ sha256 \"bce5ba2314112ad023b9a6caceba8f0ee74311ff235358c5a8f7bfa605fdf0cf\" => :mojave\n+ sha256 \"e16b7fb7c7b872ac9f81abd42afb4707f69dd878f4bc4fbe83e9fff3faccb671\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-codec.rb",
"new_path": "Formula/tezos-codec.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosCodec < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/\"\ncellar :any\n+ sha256 \"b89b972018f6a59086163b426029734ab43a9319459962bb5b37ab8459ab0a5e\" => :mojave\n+ sha256 \"f186cd6d8eb3c1c028223880aec51293665c806ef1269a97e8fd0710daec842a\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"new_path": "Formula/tezos-endorser-008-PtEdo2Zk.rb",
"diff": "@@ -29,6 +29,8 @@ class TezosEndorser008Ptedo2zk < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/\"\ncellar :any\n+ sha256 \"0f5fa558641e1e08fda154be2b9d076dfa373fc0120f41b0c14ccb30dd2183f8\" => :mojave\n+ sha256 \"513ef0ab298831919c763beca1d37500af094cba442a4f8397704d2dc9d10df5\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-node.rb",
"new_path": "Formula/tezos-node.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosNode < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/\"\ncellar :any\n+ sha256 \"8325cec25211095a9196723a5801fadc3f593eefd67ffae69508a095fc263985\" => :mojave\n+ sha256 \"9f9876e33268117a300147dabb7d2aab2602b46db4e0968f89b22c7a5c71db38\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sandbox.rb",
"new_path": "Formula/tezos-sandbox.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosSandbox < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/\"\ncellar :any\n+ sha256 \"8325cec25211095a9196723a5801fadc3f593eefd67ffae69508a095fc263985\" => :mojave\n+ sha256 \"54048e33fdafa63be4cd5f1a351d1a22b8dc00e96c0bcd90a3c8ef588d69f6d7\" => :catalina\nend\ndef make_deps\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-sapling-params.rb",
"new_path": "Formula/tezos-sapling-params.rb",
"diff": "@@ -13,6 +13,8 @@ class TezosSaplingParams < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSaplingParams.version}/\"\ncellar :any\n+ sha256 \"4e89932b0626cffe80214ba45342280c340b34c58ebbf7c3e0185a6d4662732d\" => :mojave\n+ sha256 \"5f7a5687d67051eafcfb7cb5ac542143a325a135403daeca6595602bfd400441\" => :catalina\nend\ndef install\n"
},
{
"change_type": "MODIFY",
"old_path": "Formula/tezos-signer.rb",
"new_path": "Formula/tezos-signer.rb",
"diff": "@@ -28,6 +28,8 @@ class TezosSigner < Formula\nbottle do\nroot_url \"https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/\"\ncellar :any\n+ sha256 \"fb36d48f47fb20d9cb4a93663c74e0eefe54e2f01f83e1c17b23ed187c733fc4\" => :mojave\n+ sha256 \"6fc1ee3ecd0b214280e0011b5e375ed4292d9ffbdca8dcf47e8b9091d71800ea\" => :catalina\nend\ndef make_deps\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update bottles hashes
Problem: New release was created, brew formulas now have
tezos-sapling-params dependency and also provide background services.
We should provide an easy way to obtain updated packages without
building them from scratch.
Solution: Provide hashes for the new bottles.
|
603,652
|
15.03.2021 11:08:42
| -10,800
|
3c1c1b2556fe3c0010af8b8c8979f25a8a1a30f4
|
Do native packaging for arm64
Problem: Currently both Ubuntu and Fedora native packages target only
amd64, thus it's not possible to use our package repos on the other
architectures.
Solution: Add arm64 to the list of target architectures.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -108,7 +108,7 @@ Standards-Version: 3.9.6\nHomepage: https://gitlab.com/tezos/tezos/\nPackage: {self.name.lower()}\n-Architecture: amd64\n+Architecture: amd64 arm64\nDepends: ${{shlibs:Depends}}, ${{misc:Depends}}, {\"tezos-sapling-params\" if self.requires_sapling_params else \"\"}\nDescription: {self.desc}\n'''\n@@ -199,7 +199,7 @@ Release: {release}\nEpoch: {fedora_epoch}\nSummary: {self.desc}\nLicense: MIT\n-BuildArch: x86_64\n+BuildArch: x86_64 aarch64\nSource0: {self.name}-{version}.tar.gz\nSource1: https://gitlab.com/tezos/tezos/tree/v{version}/\nBuildRequires: {build_requires} {systemd_deps}\n@@ -308,7 +308,7 @@ Standards-Version: 3.9.6\nHomepage: https://gitlab.com/tezos/tezos/\nPackage: {self.name.lower()}\n-Architecture: amd64\n+Architecture: amd64 arm64\nDepends: ${{shlibs:Depends}}, ${{misc:Depends}}\nDescription: {self.desc}\n'''\n@@ -324,7 +324,7 @@ Release: {release}\nEpoch: {fedora_epoch}\nSummary: {self.desc}\nLicense: MIT\n-BuildArch: x86_64\n+BuildArch: x86_64 aarch64\nSource0: {self.name}-{version}.tar.gz\nBuildRequires: wget\n%description\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#157] Do native packaging for arm64
Problem: Currently both Ubuntu and Fedora native packages target only
amd64, thus it's not possible to use our package repos on the other
architectures.
Solution: Add arm64 to the list of target architectures.
|
603,652
|
11.03.2021 12:55:38
| -10,800
|
3eb993dd9b513d6e937b2fe6681358ab509a3fa8
|
tezos-node-<network> aliases
Problem: It would be convenient to have such aliases when it's required
to run node with the data directory specified in the systemd service
environment.
Solution: Add tezos-node-<network> scripts that are generated during
postinst stage. They're also cleaned up during the postrm.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/package/model.py",
"new_path": "docker/package/model.py",
"diff": "@@ -68,6 +68,10 @@ class AbstractPackage:\ndef gen_postinst(self, out):\npass\n+ @abstractmethod\n+ def gen_postrm(self, out):\n+ pass\n+\nmeta = json.load(open(f\"{os.path.dirname(__file__)}/../../meta.json\", \"r\"))\nversion = os.environ[\"TEZOS_VERSION\"][1:]\n@@ -79,7 +83,7 @@ fedora_epoch = 1\nclass OpamBasedPackage(AbstractPackage):\ndef __init__(self, name: str, desc: str, systemd_units: List[SystemdUnit]=[],\ntarget_proto: str=None, optional_opam_deps: List[str]=[],\n- requires_sapling_params: bool=False, postinst_steps: str=\"\"):\n+ requires_sapling_params: bool=False, postinst_steps: str=\"\", postrm_steps: str=\"\"):\nself.name = name\nself.desc = desc\nself.systemd_units = systemd_units\n@@ -87,6 +91,7 @@ class OpamBasedPackage(AbstractPackage):\nself.optional_opam_deps = optional_opam_deps\nself.requires_sapling_params = requires_sapling_params\nself.postinst_steps = postinst_steps\n+ self.postrm_steps = postrm_steps\ndef fetch_sources(self, out_dir):\nopam_package = \"tezos-client\" if self.name == \"tezos-admin-client\" else self.name\n@@ -184,6 +189,7 @@ mkdir -p %{{buildroot}}/%{{_unitdir}}\n%postun\n{systemd_units_postun}\n+{self.postrm_steps}\n'''\nelse:\nsystemd_deps = \"\"\n@@ -284,6 +290,17 @@ set -e\nwith open(out, 'w') as f:\nf.write(postinst_contents)\n+ def gen_postrm(self, out):\n+ postrm_contents = f'''#!/bin/sh\n+\n+set -e\n+\n+#DEBHELPER#\n+\n+{self.postrm_steps}\n+'''\n+ with open(out, 'w') as f:\n+ f.write(postrm_contents)\nclass TezosSaplingParamsPackage(AbstractPackage):\ndef __init__(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -96,6 +96,7 @@ for package in packages:\nshutil.copy(f\"{os.path.dirname(__file__)}/scripts/{systemd_unit.startup_script}\", f\"debian/{systemd_unit.startup_script}\")\npackage.gen_install(\"debian/install\")\npackage.gen_postinst(\"debian/postinst\")\n+ package.gen_postrm(\"debian/postrm\")\npackage.gen_control_file(common_deps, \"debian/control\")\nsubprocess.run([\"wget\", \"-q\", \"-O\", \"debian/copyright\", f\"https://gitlab.com/tezos/tezos/-/raw/v{version}/LICENSE\"], check=True)\nsubprocess.run(\"rm debian/*.ex debian/*.EX debian/README*\", shell=True, check=True)\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/packages.py",
"new_path": "docker/package/packages.py",
"diff": "@@ -108,6 +108,7 @@ edo2net_config = '''{\nnode_units = []\nnode_postinst_steps = postinst_steps_common\n+node_postrm_steps = \"\"\ncommon_node_env = [\"NODE_RPC_ADDR=127.0.0.1:8732\", \"CERT_PATH=\", \"KEY_PATH=\"]\nfor network in networks:\nenv = [f\"DATA_DIR=/var/lib/tezos/node-{network}\", f\"NETWORK={network}\"] + common_node_env\n@@ -115,7 +116,15 @@ for network in networks:\nnode_postinst_steps += f'''mkdir -p /var/lib/tezos/node-{network}\n[ ! -f /var/lib/tezos/node-{network}/config.json ] && tezos-node config init --data-dir /var/lib/tezos/node-{network} --network {network}\nchown -R tezos:tezos /var/lib/tezos/node-{network}\n+\n+cat > /usr/bin/tezos-node-{network} <<- 'EOM'\n+#! /usr/bin/env bash\n+\n+TEZOS_NODE_DIR=\"$(cat $(systemctl show -p FragmentPath tezos-node-{network}.service | cut -d'=' -f2) | grep 'DATA_DIR' | cut -d '=' -f3 | cut -d '\"' -f1)\" tezos-node \"$@\"\n+EOM\n+chmod +x /usr/bin/tezos-node-{network}\n'''\n+ node_postrm_steps += f\"rm -f /usr/bin/tezos-node-{network}\\n\"\n# Add custom config service\nnode_units.append(mk_node_unit(suffix=\"custom\", env=[\"DATA_DIR=/var/lib/tezos/node-custom\",\n@@ -133,7 +142,14 @@ cat > /var/lib/tezos/node-edo2net/config.json <<- EOM\n{edo2net_config}\nEOM\nchown -R tezos:tezos /var/lib/tezos/node-edo2net\n+cat > /usr/bin/tezos-node-edo2net <<- 'EOM'\n+#! /usr/bin/env bash\n+\n+TEZOS_NODE_DIR=\"$(cat $(systemctl show -p FragmentPath tezos-node-edo2net.service | cut -d'=' -f2) | grep 'DATA_DIR' | cut -d '=' -f3 | cut -d '\"' -f1)\" tezos-node \"$@\"\n+EOM\n+chmod +x /usr/bin/tezos-node-edo2net\n'''\n+node_postrm_steps += f\"rm -f /usr/bin/tezos-node-edo2net\\n\"\npackages.append(OpamBasedPackage(\"tezos-node\",\n\"Entry point for initializing, configuring and running a Tezos node\",\n@@ -147,7 +163,8 @@ packages.append(OpamBasedPackage(\"tezos-node\",\n\"tezos-embedded-protocol-005-PsBabyM1\",\n\"tezos-embedded-protocol-006-PsCARTHA\"],\nrequires_sapling_params=True,\n- postinst_steps=node_postinst_steps))\n+ postinst_steps=node_postinst_steps,\n+ postrm_steps=node_postrm_steps))\nactive_protocols = json.load(open(f\"{os.path.dirname( __file__)}/../../protocols.json\", \"r\"))[\"active\"]\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#148] tezos-node-<network> aliases
Problem: It would be convenient to have such aliases when it's required
to run node with the data directory specified in the systemd service
environment.
Solution: Add tezos-node-<network> scripts that are generated during
postinst stage. They're also cleaned up during the postrm.
|
603,652
|
11.03.2021 17:16:21
| -10,800
|
90eb944e15660bcaeab91121655533cf7e005b17
|
Update README
Problem: Users need to know that new aliases exist.
Solution: Mention them in README, also update testnet name in it.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -205,17 +205,22 @@ file, they can be found in [`scripts`](./docker/package/scripts) and\nIt's possible to run multiple same services, e.g. two `tezos-node`s that run different\nnetworks.\n-`tezos-node` packages provide three services out of the box:\n-`tezos-node-delphinet` and `tezos-node-mainnet` that run\n-`delphinet` and `mainnet` networks respectively.\n+`tezos-node` packages provide multiple services out of the box:\n+`tezos-node-edo2net` and `tezos-node-mainnet` that run\n+`edo2net` and `mainnet` networks respectively.\nIn order to start it run:\n```\nsystemctl start tezos-node-<network>\n```\n+Also, there are `tezos-node-<network>` binary aliases that are equivalent to\n+```\n+TEZOS_NODE_DIR=\"<DATA_DIR from tezos-node-<network>.service>\" tezos-node\n+```\n+\nIn addition to node services where the config is predefined to a specific network\n-(e.g. `tezos-node-mainnet` or `tezos-node-delphinet`), it's possible to run `tezos-node-custom`\n+(e.g. `tezos-node-mainnet` or `tezos-node-edo2net`), it's possible to run `tezos-node-custom`\nservice and provide a path to the custom node config file via the\n`CUSTOM_NODE_CONFIG` variable in the `tezos-node-custom.service` file.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#148] Update README
Problem: Users need to know that new aliases exist.
Solution: Mention them in README, also update testnet name in it.
|
603,652
|
19.03.2021 13:22:08
| -10,800
|
75dfc5be360de05d09ca38e6f5f8ab170841eb74
|
Bump Tezos sources
Problem: v9.0-rc1 arrived, we should create pre-release for it.
Solution: Bump 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/v8.2\",\n+ \"ref\": \"refs/tags/v9.0-rc1\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"6102c808a21b32e732ab9bb1825761cd056f3e86\",\n+ \"rev\": \"69e08d4b7ac903d2e96fdbf0c4ae4099c28b5f75\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Bump Tezos sources
Problem: v9.0-rc1 arrived, we should create pre-release for it.
Solution: Bump Tezos sources.
|
603,652
|
19.03.2021 13:22:46
| -10,800
|
38bfd9f384213a72a86c3894050edabf44cbb334
|
Add new protocol support
Problem: New release candidate adds support for the new 009 protocol.
Solution: Update static_libs.patch and activate 009 protocol in
protocols.json
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": "@@ -96,96 +96,6 @@ index 7f2ec8a63..51ffdcc8b 100644\n(modules Main_native))\n(executable\n-diff --git a/src/proto_006_PsCARTHA/bin_accuser/dune b/src/proto_006_PsCARTHA/bin_accuser/dune\n-index a2aacd611..c072b2608 100644\n---- a/src/proto_006_PsCARTHA/bin_accuser/dune\n-+++ b/src/proto_006_PsCARTHA/bin_accuser/dune\n-@@ -10,7 +10,9 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_006_PsCARTHA_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-\n- (rule\n- (alias runtest_lint)\n-diff --git a/src/proto_006_PsCARTHA/bin_baker/dune b/src/proto_006_PsCARTHA/bin_baker/dune\n-index 90c152a3b..bfe9c1a3d 100644\n---- a/src/proto_006_PsCARTHA/bin_baker/dune\n-+++ b/src/proto_006_PsCARTHA/bin_baker/dune\n-@@ -10,7 +10,9 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_006_PsCARTHA_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-\n- (rule\n- (alias runtest_lint)\n-diff --git a/src/proto_006_PsCARTHA/bin_endorser/dune b/src/proto_006_PsCARTHA/bin_endorser/dune\n-index 4c8ec1004..e50f88e63 100644\n---- a/src/proto_006_PsCARTHA/bin_endorser/dune\n-+++ b/src/proto_006_PsCARTHA/bin_endorser/dune\n-@@ -10,7 +10,9 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_006_PsCARTHA_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-\n- (rule\n- (alias runtest_lint)\n-diff --git a/src/proto_007_PsDELPH1/bin_accuser/dune b/src/proto_007_PsDELPH1/bin_accuser/dune\n-index 8fe05cdc3..dee6277ee 100644\n---- a/src/proto_007_PsDELPH1/bin_accuser/dune\n-+++ b/src/proto_007_PsDELPH1/bin_accuser/dune\n-@@ -10,7 +10,9 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_007_PsDELPH1_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-\n- (rule\n- (alias runtest_lint)\n-diff --git a/src/proto_007_PsDELPH1/bin_baker/dune b/src/proto_007_PsDELPH1/bin_baker/dune\n-index 8b39572e3..7dd5146dd 100644\n---- a/src/proto_007_PsDELPH1/bin_baker/dune\n-+++ b/src/proto_007_PsDELPH1/bin_baker/dune\n-@@ -10,7 +10,9 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_007_PsDELPH1_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-\n- (rule\n- (alias runtest_lint)\n-diff --git a/src/proto_007_PsDELPH1/bin_endorser/dune b/src/proto_007_PsDELPH1/bin_endorser/dune\n-index 049bd25a2..cfded7526 100644\n---- a/src/proto_007_PsDELPH1/bin_endorser/dune\n-+++ b/src/proto_007_PsDELPH1/bin_endorser/dune\n-@@ -10,7 +10,9 @@\n- -open Tezos_client_commands\n- -open Tezos_baking_007_PsDELPH1_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-\n- (rule\n- (alias runtest_lint)\ndiff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune\nindex ee20d869a..1d6b596e0 100644\n--- a/src/proto_alpha/bin_accuser/dune\n@@ -276,3 +186,48 @@ index 81ebe6075..43e57a2d0 100644\n(rule\n(alias runtest_lint)\n+diff --git a/src/proto_009_PsFLoren/bin_accuser/dune b/src/proto_009_PsFLoren/bin_accuser/dune\n+index 11c77973e3..43515f16ed 100644\n+--- a/src/proto_009_PsFLoren/bin_accuser/dune\n++++ b/src/proto_009_PsFLoren/bin_accuser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_009_PsFLoren_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+\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_009_PsFLoren/bin_baker/dune b/src/proto_009_PsFLoren/bin_baker/dune\n+index 0535edf13c..f0c85ad447 100644\n+--- a/src/proto_009_PsFLoren/bin_baker/dune\n++++ b/src/proto_009_PsFLoren/bin_baker/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_009_PsFLoren_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+\n+ (rule\n+ (alias runtest_lint)\n+diff --git a/src/proto_009_PsFLoren/bin_endorser/dune b/src/proto_009_PsFLoren/bin_endorser/dune\n+index c19a310a8f..6c38226293 100644\n+--- a/src/proto_009_PsFLoren/bin_endorser/dune\n++++ b/src/proto_009_PsFLoren/bin_endorser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_009_PsFLoren_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+\n+ (rule\n+ (alias runtest_lint)\n"
},
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "\"008-PtEdoTez\"\n],\n\"active\": [\n- \"008-PtEdo2Zk\"\n+ \"008-PtEdo2Zk\",\n+ \"009-PsFLoren\"\n]\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add new protocol support
Problem: New release candidate adds support for the new 009 protocol.
Solution: Update static_libs.patch and activate 009 protocol in
protocols.json
|
603,652
|
22.03.2021 14:40:09
| -10,800
|
3b5de471952afe62744b0453292ef20925dac5c2
|
Update nix dependencies
Problem: There are new ocaml dependencies require newer dune version.
Also, some of the required deps aren't presented in the old
opam-repository revision.
Solution: Bump nixpkgs and opam-repository. Also use nixpkgs-unstable,
because revision in our fork has bug with cycle references.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"branch\": \"master\",\n\"description\": \"Pinned Nixpkgs tree (master follows nixos-unstable-small, only tags have stable history)\",\n\"homepage\": \"\",\n- \"owner\": \"serokell\",\n+ \"owner\": \"NixOS\",\n\"repo\": \"nixpkgs\",\n- \"rev\": \"66a26e65eb7f9b6cb3f773052da0cd3ac52f015c\",\n- \"sha256\": \"09ab1wywcwhqlwy566y00h6q8c7x64qvdk2b82jvadixbanx46wh\",\n+ \"rev\": \"fcab19deb78fbb5ea24e19b133cf34358176396a\",\n+ \"sha256\": \"1x78z784sqrkhjx82ca9zchsxhwyyx60yb7wx8gji48nrbw36ijq\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/serokell/nixpkgs/archive/66a26e65eb7f9b6cb3f773052da0cd3ac52f015c.tar.gz\",\n+ \"url\": \"https://github.com/NixOS/nixpkgs/archive/fcab19deb78fbb5ea24e19b133cf34358176396a.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\": \"ca8560e5f86de88fe8d1a1050a1e125b55b587e7\",\n- \"sha256\": \"18xxs1gadsc4a361mjv7pgjb43d2dn9z0ahk1c4pjpj6lajhbxw9\",\n+ \"rev\": \"e565d865022b13bf63826b0a39f9276043c3ca6b\",\n+ \"sha256\": \"1xfy4q47hq7lirk6pyir2gbwc3fqd1gywy9qdl0sbx962lyjl7sw\",\n\"type\": \"tarball\",\n- \"url\": \"https://github.com/ocaml/opam-repository/archive/ca8560e5f86de88fe8d1a1050a1e125b55b587e7.tar.gz\",\n+ \"url\": \"https://github.com/ocaml/opam-repository/archive/e565d865022b13bf63826b0a39f9276043c3ca6b.tar.gz\",\n\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Update nix dependencies
Problem: There are new ocaml dependencies require newer dune version.
Also, some of the required deps aren't presented in the old
opam-repository revision.
Solution: Bump nixpkgs and opam-repository. Also use nixpkgs-unstable,
because revision in our fork has bug with cycle references.
|
603,652
|
22.03.2021 15:14:08
| -10,800
|
003488d8b543a879c2ed5ff0f1dc0ad70aae8bf2
|
Adjust hacks.nix
Problem: Nixpkgs and opam-repository updates brought some new errors
that need to be workaround.
Solution: Adjust hacks.nix so that Tezos binaries compile.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/build/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": "@@ -20,15 +20,27 @@ let\n./bls12-381-add-Cargo.lock.patch\n];\n};\n- librustzcash = self.rustPlatform.buildRustPackage rec {\n- pname = \"librustzcash\";\n- version = \"0.1.0\";\n- RUSTFLAGS = \"-C target-feature=-crt-static -C lto=off\";\n- src = builtins.fetchTarball {\n- url = \"https://github.com/zcash/librustzcash/archive/0.1.0.tar.gz\";\n+ sources = import ../nix/sources.nix;\n+ inherit (import \"${sources.crate2nix}/tools.nix\" { pkgs = self; }) generatedCargoNix;\n+ librustzcash = (self.callPackage (generatedCargoNix rec {\n+ name = \"librustzcash\";\n+ src = self.fetchzip {\n+ url =\n+ \"https://github.com/zcash/zcash/archive/8c778c9c0d9f3c91650f02d0becaacac24e61108.tar.gz\";\n+ sha256 = \"sha256-EHX8MHQZG3dTnHV2J2vFbDlurV8pNYggxTYLOyUT/yY=\";\n+ };\n+ }) {\n+ defaultCrateOverrides = self.defaultCrateOverrides // {\n+ librustzcash = oa: {\n+ postBuild = \"build_lib src/rust/src/rustzcash.rs\";\n+ postInstall = ''\n+ mkdir -p $out/lib\n+ cp -r $lib/lib/*.a $out/lib/librustzcash.a\n+ '';\n+ extraRustcOpts = [\"-C lto=off\"];\n};\n- cargoSha256 = \"1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax\";\n};\n+ }).rootCrate.build;\nzcash-params = import ./zcash.nix {};\nzcash-post-fixup = pkg: ''\nmv $bin/${pkg.name} $bin/${pkg.name}-wrapped\n@@ -36,10 +48,8 @@ let\n'';\nin\nrec {\n- ocaml = self.ocaml-ng.ocamlPackages_4_09.ocaml.overrideAttrs (o: o // {\n- hardeningDisable = o.hardeningDisable ++\n- self.stdenv.lib.optional self.stdenv.hostPlatform.isMusl \"pie\";\n- });\n+ ocaml = self.ocaml-ng.ocamlPackages_4_10.ocaml;\n+ dune = self.ocamlPackages.dune_2;\n# FIXME opam-nix needs to do this\nocamlfind = findlib;\n@@ -56,16 +66,16 @@ rec {\nhacl-star = osuper.hacl-star.overrideAttrs (_: rec {\nsourceRoot = \".\";\n});\n- irmin = osuper.irmin.versions.\"2.2.0\";\n- irmin-pack = osuper.irmin-pack.versions.\"2.2.0\".overrideAttrs (o : rec {\n- buildInputs = o.buildInputs ++ [ alcotest-lwt ];\n- propagatedBuildInputs = buildInputs;\n- });\n+ index = osuper.index.versions.\"1.3.0\";\n+ irmin = osuper.irmin.versions.\"2.5.1\";\n+ irmin-pack = osuper.irmin-pack.versions.\"2.5.1\";\n+ irmin-layers = osuper.irmin-layers.versions.\"2.5.1\";\npcre = osuper.pcre.overrideAttrs (o: rec {\nbuildInputs = o.buildInputs ++ [ odoc ];\npropagatedBuildInputs = buildInputs;\n});\n+ ff = osuper.ff.versions.\"0.4.0\";\nbls12-381 = osuper.bls12-381.overrideAttrs (o:\nrec {\nbuildInputs = o.buildInputs ++ [ rustc-bls12-381 ];\n@@ -75,21 +85,21 @@ rec {\n});\ntezos-sapling = osuper.tezos-sapling.overrideAttrs (o:\n- let extern-C-patch = ./librustzcash-extern-C.patch; in\nrec {\nbuildInputs = o.buildInputs ++ [ librustzcash rustc-bls12-381 self.gcc self.git ];\nbuildPhase = ''\n- cp ${librustzcash.src}/librustzcash/include/librustzcash.h .\n- patch librustzcash.h ${extern-C-patch}\n+ cp ${librustzcash.src}/src/rust/include/librustzcash.h .\n'' + o.buildPhase;\n}\n);\n- zarith = osuper.zarith.overrideAttrs(_ : {\n+ zarith = osuper.zarith.overrideAttrs(o : {\nversion = \"1.10\";\n+ buildInputs = o.buildInputs ++ [self.perl];\nsrc = self.fetchurl {\nurl = \"https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz\";\nsha256 = \"1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb\";\n};\n+ patchPhase = \"patchShebangs ./z_pp.pl\";\n});\n# FIXME opam-nix needs to handle \"external\" (native) dependencies correctly\n@@ -102,7 +112,27 @@ rec {\nconf-rust = self.cargo;\nconf-libpcre = self.pcre;\nconf-perl = self.perl;\n- ctypes-foreign = oself.ctypes;\n+ conf-m4 = self.m4;\n+ ctypes-foreign = ctypes;\n+ gmp = self.gmp;\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# FIXME X11 in nixpkgs musl\nlablgtk = null;\n@@ -142,6 +172,16 @@ rec {\nbuildInputs = o.buildInputs ++ [ librustzcash ];\nXDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n});\n+ tezos-protocol-009-PsFLorBA-parameters = osuper.tezos-protocol-009-PsFLorBA-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\n+ tezos-protocol-009-PsFLoren-parameters = osuper.tezos-protocol-009-PsFLoren-parameters.overrideAttrs\n+ (o: rec {\n+ buildInputs = o.buildInputs ++ [ librustzcash ];\n+ XDG_DATA_DIRS = \"${zcash-params}:$XDG_DATA_DIRS\";\n+ });\n# FIXME apply this patch upstream\ntezos-stdlib-unix = osuper.tezos-stdlib-unix.overrideAttrs\n@@ -154,32 +194,32 @@ rec {\npostFixup = zcash-post-fixup o;\n});\n- tezos-accuser-007-PsDELPH1 = osuper.tezos-accuser-007-PsDELPH1.overrideAttrs\n+ tezos-accuser-008-PtEdo2Zk = osuper.tezos-accuser-008-PtEdo2Zk.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-baker-007-PsDELPH1 = osuper.tezos-baker-007-PsDELPH1.overrideAttrs\n+ tezos-baker-008-PtEdo2Zk = osuper.tezos-baker-008-PtEdo2Zk.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-endorser-007-PsDELPH1 = osuper.tezos-endorser-007-PsDELPH1.overrideAttrs\n+ tezos-endorser-008-PtEdo2Zk = osuper.tezos-endorser-008-PtEdo2Zk.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-accuser-008-PtEdo2Zk = osuper.tezos-accuser-008-PtEdo2Zk.overrideAttrs\n+ tezos-accuser-009-PsFLoren = osuper.tezos-accuser-009-PsFLoren.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-baker-008-PtEdo2Zk = osuper.tezos-baker-008-PtEdo2Zk.overrideAttrs\n+ tezos-baker-009-PsFLoren = osuper.tezos-baker-009-PsFLoren.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n});\n- tezos-endorser-008-PtEdo2Zk = osuper.tezos-endorser-008-PtEdo2Zk.overrideAttrs\n+ tezos-endorser-009-PsFLoren = osuper.tezos-endorser-009-PsFLoren.overrideAttrs\n(o: {\nbuildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];\npostFixup = zcash-post-fixup o;\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "{\n+ \"crate2nix\": {\n+ \"branch\": \"master\",\n+ \"description\": \"nix build file generator for rust crates\",\n+ \"homepage\": \"\",\n+ \"owner\": \"kolloch\",\n+ \"repo\": \"crate2nix\",\n+ \"rev\": \"be7de80a3a94f169f8e666d63031af3122b61f6e\",\n+ \"sha256\": \"1yggdxkxgnpq23kzgcij8ljahvmvj5cs88vy9sa2wsmqsjpiv2h6\",\n+ \"type\": \"tarball\",\n+ \"url\": \"https://github.com/kolloch/crate2nix/archive/be7de80a3a94f169f8e666d63031af3122b61f6e.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"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjust hacks.nix
Problem: Nixpkgs and opam-repository updates brought some new errors
that need to be workaround.
Solution: Adjust hacks.nix so that Tezos binaries compile.
|
603,652
|
22.03.2021 15:27:05
| -10,800
|
5c0b3c7cfaf9b031c5d65cd13aecbc93c7e63f74
|
Adjust tests
Problem: Turned out that nix-binaries-tests use old 007 binaries, which
now aren't supported.
Solution: Use 008 binaries in tests.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/test_script.py",
"new_path": "tests/test_script.py",
"diff": "@@ -83,14 +83,14 @@ def test_node_with_daemons_scenario(network, use_tls=False):\nkill_node_with_daemons()\n-with subtest(\"run node with daemons on delphinet\"):\n- test_node_with_daemons_scenario(\"delphinet\")\n+with subtest(\"run node with daemons on florencenet\"):\n+ test_node_with_daemons_scenario(\"florencenet\")\nwith subtest(\"run node with daemons on mainnet\"):\ntest_node_with_daemons_scenario(\"mainnet\")\nwith subtest(\"run node with daemons using tls\"):\n- test_node_with_daemons_scenario(\"delphinet\", use_tls=True)\n+ test_node_with_daemons_scenario(\"florencenet\", use_tls=True)\nwith subtest(\"test remote signer\"):\nmachine.succeed(f\"{tezos_signer} -d signer-dir gen keys signer\")\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-007-PsDELPH1 tezos-baker-007-PsDELPH1 tezos-endorser-007-PsDELPH1;\n+ tezos-accuser-008-PtEdo2Zk tezos-baker-008-PtEdo2Zk tezos-endorser-008-PtEdo2Zk;\nin import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n{\nnodes.machine = { ... }: {\n@@ -19,13 +19,13 @@ in import \"${nixpkgs}/nixos/tests/make-test-python.nix\" ({ ... }:\n};\ntestScript = ''\n- tezos_accuser = \"${tezos-accuser-007-PsDELPH1}/bin/tezos-accuser-007-PsDELPH1\"\n+ tezos_accuser = \"${tezos-accuser-008-PtEdo2Zk}/bin/tezos-accuser-008-PtEdo2Zk\"\ntezos_admin_client = \"${tezos-admin-client}/bin/tezos-admin-client\"\n- tezos_baker = \"${tezos-baker-007-PsDELPH1}/bin/tezos-baker-007-PsDELPH1\"\n+ tezos_baker = \"${tezos-baker-008-PtEdo2Zk}/bin/tezos-baker-008-PtEdo2Zk\"\ntezos_client = (\n\"${tezos-client}/bin/tezos-client\"\n)\n- tezos_endorser = \"${tezos-endorser-007-PsDELPH1}/bin/tezos-endorser-007-PsDELPH1\"\n+ tezos_endorser = \"${tezos-endorser-008-PtEdo2Zk}/bin/tezos-endorser-008-PtEdo2Zk\"\ntezos_node = \"${tezos-node}/bin/tezos-node\"\ntezos_signer = (\n\"${tezos-signer}/bin/tezos-signer\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Adjust tests
Problem: Turned out that nix-binaries-tests use old 007 binaries, which
now aren't supported.
Solution: Use 008 binaries in tests.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.