From 27352d0a7be31f608639ea862fa1ac209ac50c48 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 25 Apr 2022 13:52:51 +0930 Subject: [PATCH 1/3] CHANGELOG.md: Looks like rc5 was the ticket! Signed-off-by: Rusty Russell --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef4409beeb52..1f904860ed70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 TODO: Insert version codename, and username of the contributor that named the release. --> -## [v0.11.0rc5] - 2022-04-04: Simon's Carefully Chosen Release Name +## [v0.11.0] - 2022-04-04: Simon's Carefully Chosen Release Name This release would have been named by Simon Vrouwe, had he responded to my emails! From f5df69020d249ab592a2e896c2b8be50da72856a Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 25 Apr 2022 19:42:12 +0930 Subject: [PATCH 2/3] v0.11.0.1: final fixes for release build Signed-off-by: Rusty Russell --- CHANGELOG.md | 2 +- tools/build-release.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f904860ed70..a7aa6a9dec7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 TODO: Insert version codename, and username of the contributor that named the release. --> -## [v0.11.0] - 2022-04-04: Simon's Carefully Chosen Release Name +## [0.11.0.1] - 2022-04-04: Simon's Carefully Chosen Release Name This release would have been named by Simon Vrouwe, had he responded to my emails! diff --git a/tools/build-release.sh b/tools/build-release.sh index bd06d411949a..77c5e3e9e22b 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -80,11 +80,11 @@ for target in $TARGETS; do [ "$platform" != "$target" ] || continue case $platform in Fedora-28-amd64) - DOCKERFILE=contrib/Dockerfile.builder.fedora + DOCKERFILE=contrib/docker/Dockerfile.builder.fedora TAG=fedora ;; Ubuntu-16.04-amd64) - DOCKERFILE=contrib/Dockerfile.builder + DOCKERFILE=contrib/docker/Dockerfile.builder TAG=ubuntu-amd64 ;; *) From 0ec947f699b5ee540bcd91d687941c628236a405 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 25 Apr 2022 21:03:22 +0930 Subject: [PATCH 3/3] doc: fix getinfo non-ASCII chars for older mrkd. When building reproducible build for Bionic: ``` Traceback (most recent call last): File "/usr/local/bin/mrkd", line 8, in sys.exit(main()) File "/usr/local/lib/python3.6/dist-packages/mrkd/__init__.py", line 261, in main result = mistune.markdown(fp.read(), inline=inline, renderer=renderer) File "/usr/lib/python3.6/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 1856: ordinal not in range(128) doc/Makefile:120: recipe for target 'doc/lightning-getinfo.7' failed make: *** [doc/lightning-getinfo.7] Error 1 ``` Signed-off-by: Rusty Russell --- doc/lightning-getinfo.7.md | 4 ++-- doc/schemas/getinfo.schema.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/lightning-getinfo.7.md b/doc/lightning-getinfo.7.md index 75921d06f7e1..8330ee0052b1 100644 --- a/doc/lightning-getinfo.7.md +++ b/doc/lightning-getinfo.7.md @@ -42,7 +42,7 @@ On success, an object is returned, containing: - **our_features** (object, optional): Our BOLT #9 feature bits (as hexstring) for various contexts: - **init** (hex): features (incl. globalfeatures) in our init message, these also restrict what we offer in open_channel or accept in accept_channel - **node** (hex): features in our node_announcement message - - **channel** (hex): negotiated channel features we — as channel initiator — publish in the channel_announcement message + - **channel** (hex): negotiated channel features we (as channel initiator) publish in the channel_announcement message - **invoice** (hex): features in our BOLT11 invoices - **address** (array of objects, optional): The addresses we announce to the world: - **type** (string): Type of connection (one of "dns", "ipv4", "ipv6", "torv2", "torv3", "websocket") @@ -128,4 +128,4 @@ RESOURCES --------- Main web site: -[comment]: # ( SHA256STAMP:f7c85915ae8da7e9cabd2c72a31157801524b53f6bf8463da1743a0ee71e7c88) +[comment]: # ( SHA256STAMP:52175b0eced3ed2992d27b983b50afe080134702874116ce0c8355a8adddd440) diff --git a/doc/schemas/getinfo.schema.json b/doc/schemas/getinfo.schema.json index 2ddbfc3553aa..21001d0c78dd 100644 --- a/doc/schemas/getinfo.schema.json +++ b/doc/schemas/getinfo.schema.json @@ -77,7 +77,7 @@ }, "channel": { "type": "hex", - "description": "negotiated channel features we — as channel initiator — publish in the channel_announcement message" + "description": "negotiated channel features we (as channel initiator) publish in the channel_announcement message" }, "invoice": { "type": "hex",