clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE #22685
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Contributor
|
Concept ACK |
achow101
reviewed
Aug 11, 2021
| //! git will put "#define GIT_COMMIT_ID ..." on the next line inside archives. $Format:%n#define GIT_COMMIT_ID "%H"$ | ||
|
|
||
| #ifdef BUILD_GIT_TAG | ||
| #define BUILD_DESC BUILD_GIT_TAG |
Member
There was a problem hiding this comment.
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.
Contributor
|
Concept ACK |
Member
|
Concept ACK. This is definitely the cleanest of the 3 solutions. |
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): diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
index b7bf76ce77..1e925a596c 100755
--- a/contrib/devtools/gen-manpages.sh
+++ b/contrib/devtools/gen-manpages.sh
@@ -36,7 +36,7 @@ then
fi
# The autodetected version git tag can screw up manpage output a little bit
-read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')"
+read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }' | awk -F 'rc' '{ print $1}')"
# Create a footer file with copyright content.
# This gets autodetected fine for bitcoind if --version-string is not set, |
Member
|
ACK 5100dee |
Member
|
Guix builds: 1202344afc95fd8d8627f230cf9a6d0cf04fb7d1c929add8fb1f7a02699c1585 guix-build-5100deee5822/output/aarch64-linux-gnu/SHA256SUMS.part
7298e2719ce34c637f2150b03396d0d34dfb495ea54e45721b127f158f55db20 guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu-debug.tar.gz
e71db2a68a8aa3348aca492a3c302078727e69a9d603a75c6858ff4120a80834 guix-build-5100deee5822/output/aarch64-linux-gnu/bitcoin-5100deee5822-aarch64-linux-gnu.tar.gz
695fcc30b5352a4d4a66ede32a76f8aa2da1ffe19de7ef2472cae4119556899e guix-build-5100deee5822/output/arm-linux-gnueabihf/SHA256SUMS.part
2e0795e4be06795f4dda5314d424165cab27c562bfc3ec668f6b145cbbbfd7ca guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf-debug.tar.gz
bd9c38b719802554f39382fad6c1aa4828821d4c531003a9698ac33107c9d856 guix-build-5100deee5822/output/arm-linux-gnueabihf/bitcoin-5100deee5822-arm-linux-gnueabihf.tar.gz
75357a9765ddfbaf565ffbc113b4dd0755c9317e11bf4fc8aaffdcb7d1043a76 guix-build-5100deee5822/output/dist-archive/bitcoin-5100deee5822.tar.gz
1343e7b9dc67b1015a7dd75d0d513d7fdfee3acd4fa006ca280fb2e00bfacb95 guix-build-5100deee5822/output/powerpc64-linux-gnu/SHA256SUMS.part
a5771e0b3aa149cd9d1ed5088275e2d0537a41b607590417413ceb60b3c3c1bd guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu-debug.tar.gz
df9ebaadeff34f0c7adc5c3833513b8315d0d4bd608cdd9917b582a2877dce6a guix-build-5100deee5822/output/powerpc64-linux-gnu/bitcoin-5100deee5822-powerpc64-linux-gnu.tar.gz
ca2b204cae0f6968ce01bb91d3f215bc7b09d3ac66181c32a5aceb5e10b5315d guix-build-5100deee5822/output/powerpc64le-linux-gnu/SHA256SUMS.part
354f9429f2592744c57b067a4a489baae4627bc9feaa0892bf47f470c71db851 guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu-debug.tar.gz
b80918dbd7f50d62944a47ff007900c2bb0924a9f5ee0aa74a3deeb5ffda5683 guix-build-5100deee5822/output/powerpc64le-linux-gnu/bitcoin-5100deee5822-powerpc64le-linux-gnu.tar.gz
7875e63f6f822c3ebc9e41f71b9c7e41cdc3511b114cd9bf0df84e2f5dd4d432 guix-build-5100deee5822/output/riscv64-linux-gnu/SHA256SUMS.part
f779ef2e6362e2f0c8f500295e2e2aab7cb8039fb247eeaa3aa37195a0f86910 guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu-debug.tar.gz
9017ef643dfa00a2c9ff31b8f65d31d5ded5b24b97d3f94e8771b94548620804 guix-build-5100deee5822/output/riscv64-linux-gnu/bitcoin-5100deee5822-riscv64-linux-gnu.tar.gz
438adfd3e69da54d4ccb928235e9c6d5f0ee1ed25234d1ffe35a1f4a83d78a70 guix-build-5100deee5822/output/x86_64-apple-darwin18/SHA256SUMS.part
7a00a8f318283244b19d10977a3c04c7a24b2bab3fb6437a932c5e5c6ab911f9 guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.dmg
641f686bbf0b13a8718183866445c77f330381f7d270f2b97e462998fe9177c9 guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx-unsigned.tar.gz
7455214dde894173c75d77aa41897d796c14168cb5987b09e1104a7ed61362d0 guix-build-5100deee5822/output/x86_64-apple-darwin18/bitcoin-5100deee5822-osx64.tar.gz
e39df678e23158507a0edd98434cda7cc26ea55688c8c6ccb72d114fec7b1b03 guix-build-5100deee5822/output/x86_64-linux-gnu/SHA256SUMS.part
c8c4d8a94855a8faebe8c50014951a6fc131d9284969671a9db435d4fb186b0a guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu-debug.tar.gz
701a4ce1b08c8784d1fa2238222153907e5a65929bf35e35a82d22897faf2093 guix-build-5100deee5822/output/x86_64-linux-gnu/bitcoin-5100deee5822-x86_64-linux-gnu.tar.gz
634def2d255b106d8178933ac4aeb441771ad3b9013a0c100171bf1692a13f8b guix-build-5100deee5822/output/x86_64-w64-mingw32/SHA256SUMS.part
75b2e5d219c9ffbd0a21a3253912d36ff875b8c748b75e80bac991b31d96221a guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win-unsigned.tar.gz
4fa3b8659e63946714d235e5d5fc6b442e6dd529909310684f94f128ccb5fa4a guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-debug.zip
bd922abcd2e2c4a360a9174f6f27fe12cf251ed956e74bb135390be26ecb9f17 guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64-setup-unsigned.exe
2220fb64cc05567a11c948fb9b2d5fc9311f6d02a705a4c98e8fa9db46f177f5 guix-build-5100deee5822/output/x86_64-w64-mingw32/bitcoin-5100deee5822-win64.zip |
Contributor
|
Contributing GUIX hashes, mine match @fanquake |
Member
|
Merged
Member
|
Backported in #22629. |
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Aug 20, 2021
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. Github-Pull: bitcoin#22685 Rebased-From: 5100dee
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Aug 20, 2021
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. Github-Pull: bitcoin#22685 Rebased-From: 5100dee
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Aug 20, 2021
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. Github-Pull: bitcoin#22685 Rebased-From: 5100dee
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Aug 20, 2021
…ELEASE 5100dee clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE (Carl Dong) Pull request description: ``` 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. ``` Fixes the underlying problem of bitcoin#22623 ACKs for top commit: achow101: ACK 5100dee fanquake: ACK 5100dee - 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`. Tree-SHA512: 78705e285ff1271d5012e888837049044db4d11d66c252c6b964685892ef078c56fe122f12daa87c71532f4352f695d1e88a228665adcd7afe3ddce3f209b49f
laanwj
added a commit
that referenced
this pull request
Aug 26, 2021
32e1424 Fix build with Boost 1.77.0 (Rafael Sadowski) cb34a0a qt: Handle new added plurals in bitcoin_en.ts (Hennadii Stepanov) 068985c doc: Mention the flat directory structure for uploads (Andrew Chow) 27d43e5 guix: Don't include directory name in SHA256SUMS (Andrew Chow) 88fb7e3 test: fix bug in 22686 (S3RK) 63fec7e clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE (Carl Dong) dfaffbe test: Test for ApproximateBestSubset edge case with too little fees (Andrew Chow) e86b023 wallet: Assert that enough was selected to cover the fees (Andrew Chow) ffc81e2 wallet: Use GetSelectionAmount for target value calculations (Andrew Chow) ce77b45 release: Release with separate SHA256SUMS and sig files (Carl Dong) cb491bd guix-verify: Non-zero exit code when anything fails (Carl Dong) 6a611d2 gui: ensure external signer option remains disabled without signers (Andrew Chow) e9b4487 qt: Fix regression in "Encrypt Wallet" menu item (Hennadii Stepanov) 57fce06 consensus/params: simplify ValidDeployment check to avoid gcc warning (Anthony Towns) e9d30fb ci: Run fuzzer task for the master branch only (Hennadii Stepanov) Pull request description: Backported: 1) #22730 1) bitcoin-core/gui#393 1) #22597 1) bitcoin-core/gui#396 1) #22643 1) #22642 1) #22685 1) #22686 1) #22654 1) #22742 1) bitcoin-core/gui#406 1) #22713 ACKs for top commit: laanwj: Code list-of-backported-PRs review ACK 32e1424 Tree-SHA512: f5e2dd1be6cdcd39368eeb5d297b3ff4418d0bf2e70c90e59ab4ba1dbf16f773045d877b4997511de58c3aca75a978dcf043e338bad23951557e2a27ccc845f6
fujicoin
pushed a commit
to fujicoin/fujicoin-22.0
that referenced
this pull request
Aug 27, 2021
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. Github-Pull: bitcoin/bitcoin#22685 Rebased-From: 5100deee5822795d385570a380d3c117d05d851d
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
May 11, 2022
…ELEASE 5100dee clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE (Carl Dong) Pull request description: ``` 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. ``` Fixes the underlying problem of bitcoin#22623 ACKs for top commit: achow101: ACK 5100dee fanquake: ACK 5100dee - 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`. Tree-SHA512: 78705e285ff1271d5012e888837049044db4d11d66c252c6b964685892ef078c56fe122f12daa87c71532f4352f695d1e88a228665adcd7afe3ddce3f209b49f
UdjinM6
added a commit
to dashpay/dash
that referenced
this pull request
May 12, 2022
backport: bitcoin#22685: clientversion: No suffix #if CLIENT_VERS…
gwillen
pushed a commit
to gwillen/elements
that referenced
this pull request
Jul 27, 2022
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. Github-Pull: bitcoin/bitcoin#22685 Rebased-From: 5100dee
gwillen
pushed a commit
to gwillen/elements
that referenced
this pull request
Aug 1, 2022
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. Github-Pull: bitcoin/bitcoin#22685 Rebased-From: 5100dee
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the underlying problem of #22623