clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE #22685

pull dongcarl wants to merge 1 commits into bitcoin:master from dongcarl:2021-08-clientversion-is-cursed changing 1 files +4 −2
  1. dongcarl commented at 8:46 pm on August 11, 2021: member 
    0Previously, building from a release source tarball would result in a
1version string like v22.0.0-<commithash>, but we expect just v22.0.0.
2This commit solves this problem.
3
4Also use PACKAGE_VERSION instead of reconstructing it.

    Fixes the underlying problem of #22623

  2. clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE 
    Previously, building from a release source tarball would result in a
version string like v22.0.0-<commithash>, but we expect just v22.0.0.
This commit solves this problem.

Also use PACKAGE_VERSION instead of reconstructing it.
    5100deee58
  3. theStack commented at 8:57 pm on August 11, 2021: member
    Concept ACK
  4. in src/clientversion.cpp:30 in 5100deee58 
    29@@ -30,8 +30,10 @@ const std::string CLIENT_NAME("Satoshi");
30     #define BUILD_DESC BUILD_GIT_TAG
    achow101 commented at 8:58 pm on August 11, 2021:
    Does it make sense to keep BUILD_GIT_TAG around? I think it’s better to always use the version set in the source rather than whatever the current git tag might be.
  5. Zero-1729 commented at 9:14 pm on August 11, 2021: contributor
    Concept ACK
  6. fanquake commented at 2:25 am on August 12, 2021: member
    Concept ACK. This is definitely the cleanest of the 3 solutions.
  7. fanquake added this to the milestone 22.0 on Aug 12, 2021
  8. fanquake added the label Needs backport (22.x) on Aug 12, 2021
  9. achow101 commented at 3:05 am on August 12, 2021: member

    Note that this makes #22681 actually occur regardless of whether the current commit is the tag. The following diff would fix that (I’m sure someone could come up with something better):

     0diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
 1index b7bf76ce77..1e925a596c 100755
 2--- a/contrib/devtools/gen-manpages.sh
 3+++ b/contrib/devtools/gen-manpages.sh
 4@@ -36,7 +36,7 @@ then
 5 fi
 6 
 7 # The autodetected version git tag can screw up manpage output a little bit
 8-read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')"
 9+read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }' | awk -F 'rc' '{ print $1}')"
10 
11 # Create a footer file with copyright content.
12 # This gets autodetected fine for bitcoind if --version-string is not set,
  10. achow101 commented at 3:45 am on August 12, 2021: member
    ACK 5100deee5822795d385570a380d3c117d05d851d
  11. fanquake commented at 4:56 am on August 12, 2021: member

    Guix builds:

     01202344afc95fd8d8627f230cf9a6d0cf04fb7d1c929add8fb1f7a02699c1585  guix-build-5100deee5822/output/aarch64-linux-gnu/SHA256SUMS.part
 17298e2719ce34c637f2150b03396d0d34dfb495ea54e45721b127f158f55db20  guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu-debug.tar.gz
 2e71db2a68a8aa3348aca492a3c302078727e69a9d603a75c6858ff4120a80834  guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu.tar.gz
 3695fcc30b5352a4d4a66ede32a76f8aa2da1ffe19de7ef2472cae4119556899e  guix-build-5100deee5822/output/arm-linux-gnueabihf/SHA256SUMS.part
 42e0795e4be06795f4dda5314d424165cab27c562bfc3ec668f6b145cbbbfd7ca  guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf-debug.tar.gz
 5bd9c38b719802554f39382fad6c1aa4828821d4c531003a9698ac33107c9d856  guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf.tar.gz
 675357a9765ddfbaf565ffbc113b4dd0755c9317e11bf4fc8aaffdcb7d1043a76  guix-build-5100deee5822/output/dist-archive/bitcoin-5100deee5822.tar.gz
 71343e7b9dc67b1015a7dd75d0d513d7fdfee3acd4fa006ca280fb2e00bfacb95  guix-build-5100deee5822/output/powerpc64-linux-gnu/SHA256SUMS.part
 8a5771e0b3aa149cd9d1ed5088275e2d0537a41b607590417413ceb60b3c3c1bd  guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu-debug.tar.gz
 9df9ebaadeff34f0c7adc5c3833513b8315d0d4bd608cdd9917b582a2877dce6a  guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu.tar.gz
10ca2b204cae0f6968ce01bb91d3f215bc7b09d3ac66181c32a5aceb5e10b5315d  guix-build-5100deee5822/output/powerpc64le-linux-gnu/SHA256SUMS.part
11354f9429f2592744c57b067a4a489baae4627bc9feaa0892bf47f470c71db851  guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu-debug.tar.gz
12b80918dbd7f50d62944a47ff007900c2bb0924a9f5ee0aa74a3deeb5ffda5683  guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu.tar.gz
137875e63f6f822c3ebc9e41f71b9c7e41cdc3511b114cd9bf0df84e2f5dd4d432  guix-build-5100deee5822/output/riscv64-linux-gnu/SHA256SUMS.part
14f779ef2e6362e2f0c8f500295e2e2aab7cb8039fb247eeaa3aa37195a0f86910  guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu-debug.tar.gz
159017ef643dfa00a2c9ff31b8f65d31d5ded5b24b97d3f94e8771b94548620804  guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu.tar.gz
16438adfd3e69da54d4ccb928235e9c6d5f0ee1ed25234d1ffe35a1f4a83d78a70  guix-build-5100deee5822/output/x86_64-apple-darwin18/SHA256SUMS.part
177a00a8f318283244b19d10977a3c04c7a24b2bab3fb6437a932c5e5c6ab911f9  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.dmg
18641f686bbf0b13a8718183866445c77f330381f7d270f2b97e462998fe9177c9  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.tar.gz
197455214dde894173c75d77aa41897d796c14168cb5987b09e1104a7ed61362d0  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx64.tar.gz
20e39df678e23158507a0edd98434cda7cc26ea55688c8c6ccb72d114fec7b1b03  guix-build-5100deee5822/output/x86_64-linux-gnu/SHA256SUMS.part
21c8c4d8a94855a8faebe8c50014951a6fc131d9284969671a9db435d4fb186b0a  guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu-debug.tar.gz
22701a4ce1b08c8784d1fa2238222153907e5a65929bf35e35a82d22897faf2093  guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu.tar.gz
23634def2d255b106d8178933ac4aeb441771ad3b9013a0c100171bf1692a13f8b  guix-build-5100deee5822/output/x86_64-w64-mingw32/SHA256SUMS.part
2475b2e5d219c9ffbd0a21a3253912d36ff875b8c748b75e80bac991b31d96221a  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win-unsigned.tar.gz
254fa3b8659e63946714d235e5d5fc6b442e6dd529909310684f94f128ccb5fa4a  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-debug.zip
26bd922abcd2e2c4a360a9174f6f27fe12cf251ed956e74bb135390be26ecb9f17  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-setup-unsigned.exe
272220fb64cc05567a11c948fb9b2d5fc9311f6d02a705a4c98e8fa9db46f177f5  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64.zip
  12. jarolrod commented at 11:14 pm on August 13, 2021: member

    Contributing GUIX hashes, mine match @fanquake

     0find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 1
 21202344afc95fd8d8627f230cf9a6d0cf04fb7d1c929add8fb1f7a02699c1585  guix-build-5100deee5822/output/aarch64-linux-gnu/SHA256SUMS.part
 37298e2719ce34c637f2150b03396d0d34dfb495ea54e45721b127f158f55db20  guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu-debug.tar.gz
 4e71db2a68a8aa3348aca492a3c302078727e69a9d603a75c6858ff4120a80834  guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu.tar.gz
 5695fcc30b5352a4d4a66ede32a76f8aa2da1ffe19de7ef2472cae4119556899e  guix-build-5100deee5822/output/arm-linux-gnueabihf/SHA256SUMS.part
 62e0795e4be06795f4dda5314d424165cab27c562bfc3ec668f6b145cbbbfd7ca  guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf-debug.tar.gz
 7bd9c38b719802554f39382fad6c1aa4828821d4c531003a9698ac33107c9d856  guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf.tar.gz
 875357a9765ddfbaf565ffbc113b4dd0755c9317e11bf4fc8aaffdcb7d1043a76  guix-build-5100deee5822/output/dist-archive/bitcoin-5100deee5822.tar.gz
 91343e7b9dc67b1015a7dd75d0d513d7fdfee3acd4fa006ca280fb2e00bfacb95  guix-build-5100deee5822/output/powerpc64-linux-gnu/SHA256SUMS.part
10a5771e0b3aa149cd9d1ed5088275e2d0537a41b607590417413ceb60b3c3c1bd  guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu-debug.tar.gz
11df9ebaadeff34f0c7adc5c3833513b8315d0d4bd608cdd9917b582a2877dce6a  guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu.tar.gz
12ca2b204cae0f6968ce01bb91d3f215bc7b09d3ac66181c32a5aceb5e10b5315d  guix-build-5100deee5822/output/powerpc64le-linux-gnu/SHA256SUMS.part
13354f9429f2592744c57b067a4a489baae4627bc9feaa0892bf47f470c71db851  guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu-debug.tar.gz
14b80918dbd7f50d62944a47ff007900c2bb0924a9f5ee0aa74a3deeb5ffda5683  guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu.tar.gz
157875e63f6f822c3ebc9e41f71b9c7e41cdc3511b114cd9bf0df84e2f5dd4d432  guix-build-5100deee5822/output/riscv64-linux-gnu/SHA256SUMS.part
16f779ef2e6362e2f0c8f500295e2e2aab7cb8039fb247eeaa3aa37195a0f86910  guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu-debug.tar.gz
179017ef643dfa00a2c9ff31b8f65d31d5ded5b24b97d3f94e8771b94548620804  guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu.tar.gz
18438adfd3e69da54d4ccb928235e9c6d5f0ee1ed25234d1ffe35a1f4a83d78a70  guix-build-5100deee5822/output/x86_64-apple-darwin18/SHA256SUMS.part
197a00a8f318283244b19d10977a3c04c7a24b2bab3fb6437a932c5e5c6ab911f9  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.dmg
20641f686bbf0b13a8718183866445c77f330381f7d270f2b97e462998fe9177c9  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.tar.gz
217455214dde894173c75d77aa41897d796c14168cb5987b09e1104a7ed61362d0  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx64.tar.gz
22e39df678e23158507a0edd98434cda7cc26ea55688c8c6ccb72d114fec7b1b03  guix-build-5100deee5822/output/x86_64-linux-gnu/SHA256SUMS.part
23c8c4d8a94855a8faebe8c50014951a6fc131d9284969671a9db435d4fb186b0a  guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu-debug.tar.gz
24701a4ce1b08c8784d1fa2238222153907e5a65929bf35e35a82d22897faf2093  guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu.tar.gz
25634def2d255b106d8178933ac4aeb441771ad3b9013a0c100171bf1692a13f8b  guix-build-5100deee5822/output/x86_64-w64-mingw32/SHA256SUMS.part
2675b2e5d219c9ffbd0a21a3253912d36ff875b8c748b75e80bac991b31d96221a  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win-unsigned.tar.gz
274fa3b8659e63946714d235e5d5fc6b442e6dd529909310684f94f128ccb5fa4a  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-debug.zip
28bd922abcd2e2c4a360a9174f6f27fe12cf251ed956e74bb135390be26ecb9f17  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-setup-unsigned.exe
292220fb64cc05567a11c948fb9b2d5fc9311f6d02a705a4c98e8fa9db46f177f5  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64.zip
  13. achow101 commented at 0:56 am on August 14, 2021: member 
     01202344afc95fd8d8627f230cf9a6d0cf04fb7d1c929add8fb1f7a02699c1585  guix-build-5100deee5822/output/aarch64-linux-gnu/SHA256SUMS.part
 17298e2719ce34c637f2150b03396d0d34dfb495ea54e45721b127f158f55db20  guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu-debug.tar.gz
 2e71db2a68a8aa3348aca492a3c302078727e69a9d603a75c6858ff4120a80834  guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu.tar.gz
 3695fcc30b5352a4d4a66ede32a76f8aa2da1ffe19de7ef2472cae4119556899e  guix-build-5100deee5822/output/arm-linux-gnueabihf/SHA256SUMS.part
 42e0795e4be06795f4dda5314d424165cab27c562bfc3ec668f6b145cbbbfd7ca  guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf-debug.tar.gz
 5bd9c38b719802554f39382fad6c1aa4828821d4c531003a9698ac33107c9d856  guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf.tar.gz
 675357a9765ddfbaf565ffbc113b4dd0755c9317e11bf4fc8aaffdcb7d1043a76  guix-build-5100deee5822/output/dist-archive/bitcoin-5100deee5822.tar.gz
 71343e7b9dc67b1015a7dd75d0d513d7fdfee3acd4fa006ca280fb2e00bfacb95  guix-build-5100deee5822/output/powerpc64-linux-gnu/SHA256SUMS.part
 8a5771e0b3aa149cd9d1ed5088275e2d0537a41b607590417413ceb60b3c3c1bd  guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu-debug.tar.gz
 9df9ebaadeff34f0c7adc5c3833513b8315d0d4bd608cdd9917b582a2877dce6a  guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu.tar.gz
10ca2b204cae0f6968ce01bb91d3f215bc7b09d3ac66181c32a5aceb5e10b5315d  guix-build-5100deee5822/output/powerpc64le-linux-gnu/SHA256SUMS.part
11354f9429f2592744c57b067a4a489baae4627bc9feaa0892bf47f470c71db851  guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu-debug.tar.gz
12b80918dbd7f50d62944a47ff007900c2bb0924a9f5ee0aa74a3deeb5ffda5683  guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu.tar.gz
137875e63f6f822c3ebc9e41f71b9c7e41cdc3511b114cd9bf0df84e2f5dd4d432  guix-build-5100deee5822/output/riscv64-linux-gnu/SHA256SUMS.part
14f779ef2e6362e2f0c8f500295e2e2aab7cb8039fb247eeaa3aa37195a0f86910  guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu-debug.tar.gz
159017ef643dfa00a2c9ff31b8f65d31d5ded5b24b97d3f94e8771b94548620804  guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu.tar.gz
16438adfd3e69da54d4ccb928235e9c6d5f0ee1ed25234d1ffe35a1f4a83d78a70  guix-build-5100deee5822/output/x86_64-apple-darwin18/SHA256SUMS.part
177a00a8f318283244b19d10977a3c04c7a24b2bab3fb6437a932c5e5c6ab911f9  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.dmg
18641f686bbf0b13a8718183866445c77f330381f7d270f2b97e462998fe9177c9  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.tar.gz
197455214dde894173c75d77aa41897d796c14168cb5987b09e1104a7ed61362d0  guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx64.tar.gz
20e39df678e23158507a0edd98434cda7cc26ea55688c8c6ccb72d114fec7b1b03  guix-build-5100deee5822/output/x86_64-linux-gnu/SHA256SUMS.part
21c8c4d8a94855a8faebe8c50014951a6fc131d9284969671a9db435d4fb186b0a  guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu-debug.tar.gz
22701a4ce1b08c8784d1fa2238222153907e5a65929bf35e35a82d22897faf2093  guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu.tar.gz
23634def2d255b106d8178933ac4aeb441771ad3b9013a0c100171bf1692a13f8b  guix-build-5100deee5822/output/x86_64-w64-mingw32/SHA256SUMS.part
2475b2e5d219c9ffbd0a21a3253912d36ff875b8c748b75e80bac991b31d96221a  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win-unsigned.tar.gz
254fa3b8659e63946714d235e5d5fc6b442e6dd529909310684f94f128ccb5fa4a  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-debug.zip
26bd922abcd2e2c4a360a9174f6f27fe12cf251ed956e74bb135390be26ecb9f17  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-setup-unsigned.exe
272220fb64cc05567a11c948fb9b2d5fc9311f6d02a705a4c98e8fa9db46f177f5  guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64.zip
  14. fanquake approved
  15. fanquake commented at 4:16 am on August 16, 2021: member
    ACK 5100deee5822795d385570a380d3c117d05d851d - tested that prior the output of src/bitcoind -version on the 22.x branch was Bitcoin Core version v22.0.0-d3bd5410f64e, and with this commit cherry-picked it is Bitcoin Core version v22.0.0rc2.
  16. fanquake merged this on Aug 16, 2021
  17. fanquake closed this on Aug 16, 2021
  18. hebasto referenced this in commit b902a4ad3d on Aug 19, 2021
  19. hebasto commented at 7:51 am on August 19, 2021: member
    Backported in #22629.
  20. hebasto removed the label Needs backport (22.x) on Aug 19, 2021
  21. hebasto referenced this in commit ba8be70689 on Aug 20, 2021
  22. hebasto referenced this in commit 6d810d2f54 on Aug 20, 2021
  23. hebasto referenced this in commit 63fec7e295 on Aug 20, 2021
  24. sidhujag referenced this in commit f287c95739 on Aug 20, 2021
  25. laanwj referenced this in commit 4a25e39624 on Aug 26, 2021
  26. fujicoin referenced this in commit f219eeffb0 on Aug 27, 2021
  27. PastaPastaPasta referenced this in commit 8504c5a139 on May 11, 2022
  28. UdjinM6 referenced this in commit ebb5b5bcaa on May 12, 2022
  29. kittywhiskers referenced this in commit 754ca58d38 on May 17, 2022
  30. gwillen referenced this in commit edc4302ccb on Jul 27, 2022
  31. gwillen referenced this in commit 1c028b9a51 on Aug 1, 2022
  32. DrahtBot locked this on Aug 19, 2022


dongcarl theStack achow101 Zero-1729 fanquake jarolrod hebasto

Milestone
22.0

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-18 21:12 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me