balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scripts: fix alphanet/zeronet patch

Browse Source
This commit is contained in:
Marco Stronati 2018-02-04 17:38:08 +01:00 committed by Benjamin Canou
parent 0e675c2d16
commit 035042d69f
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/alphanet_constants.patch
View File

@ -1,7 +1,7 @@
diff --git a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml
index 61e79c8a..f91ce282 100644 index 61e79c8a..f91ce282 100644
--- a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml --- a/src/proto_alpha/lib_protocol/src/constants_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml
@@ -49,15 +49,14 @@ let read_public_key s = @@ -49,15 +49,14 @@ let read_public_key s =
Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s)) Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s))

12
scripts/apply_patch.sh
View File

@ -18,20 +18,16 @@ set -e
case "$branch" in case "$branch" in
zeronet) zeronet)
sed -i s/TEZOS/TEZOS_ZERONET/ ./src/lib_node_shell/distributed_db_message.ml sed -i s/TEZOS/TEZOS_ZERONET/ ./src/lib_shell/distributed_db_message.ml
patch -p1 < scripts/alphanet_constants.patch patch -p1 < scripts/alphanet_constants.patch
patch -p1 < scripts/zeronet.patch patch -p1 < scripts/zeronet.patch
cp README.md docs/README.master if has_git; then git commit -a -m "Zeronet: DO NOT MERGE" --author "Tezos CI <null@tezos.com>"; fi
cp docs/README.zeronet README.md
if has_git; then git add docs/README.master; git commit -a -m "Zeronet: DO NOT MERGE" --author "Tezos CI <null@tezos.com>"; fi
echo "Done" echo "Done"
;; ;;
alphanet) alphanet)
sed -i s/TEZOS/TEZOS_ALPHANET/ ./src/lib_node_shell/distributed_db_message.ml sed -i s/TEZOS/TEZOS_ALPHANET/ ./src/lib_shell/distributed_db_message.ml
patch -p1 < scripts/alphanet_constants.patch patch -p1 < scripts/alphanet_constants.patch
cp README.md docs/README.master if has_git; then git commit -a -m "Alphanet: DO NOT MERGE" --author "Tezos CI <null@tezos.com>"; fi
cp docs/README.alphanet README.md
if has_git; then git add docs/README.master; git commit -a -m "Alphanet: DO NOT MERGE" --author "Tezos CI <null@tezos.com>"; fi
echo "Done" echo "Done"
;; ;;
*) *)

6
scripts/zeronet.patch
View File

@ -22,9 +22,9 @@ diff --git a/scripts/alphanet.sh b/scripts/alphanet.sh
if [ $ALPHANET_EMACS ]; then if [ $ALPHANET_EMACS ]; then
interactive_flags="-t" interactive_flags="-t"
diff --git a/src/node/main/node_config_file.ml b/src/node/main/node_config_file.ml diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml
--- a/src/node/main/node_config_file.ml --- a/src/bin_node/node_config_file.ml
+++ b/src/node/main/node_config_file.ml +++ b/src/bin_node/node_config_file.ml
@@ -16,7 +16,7 @@ let home = @@ -16,7 +16,7 @@ let home =
with Not_found -> "/root" with Not_found -> "/root"