Bugfix: Only use git for build info if the repository is actually the right one #18902

pull luke-jr wants to merge 4 commits into bitcoin:master from luke-jr:fix_gitdir_again changing 6 files +61 −14

luke-jr commented at 1:47 AM on May 7, 2020: member

Fixes using unrelated git repos again, after the fix in #7522 was unexplicably removed by #18556

Also (really) fixes the "build version hack" (#18349) by embedding the correct tag in the release genbuild.sh

Based on top of #18818 to avoid unnecessary conflicts/rebasing once that's merged
fanquake added the label Build system on May 7, 2020
DrahtBot commented at 9:34 AM on May 7, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #21036 (gitian: Bump descriptors to Focal for 22.0 by fanquake)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
MarcoFalke added the label Needs gitian build on May 7, 2020
MarcoFalke added the label Needs Guix build on May 7, 2020
luke-jr referenced this in commit c17428643f on May 7, 2020
luke-jr referenced this in commit 117c280867 on May 7, 2020
luke-jr referenced this in commit 1c525e91b3 on May 7, 2020
luke-jr referenced this in commit e46e063562 on May 7, 2020
DrahtBot removed the label Needs gitian build on May 8, 2020
DrahtBot removed the label Needs Guix build on May 9, 2020
DrahtBot added the label Needs rebase on May 13, 2020
luke-jr referenced this in commit eee88e3356 on May 14, 2020
luke-jr referenced this in commit f9232da7ea on May 14, 2020
luke-jr force-pushed on Oct 12, 2020
DrahtBot removed the label Needs rebase on Oct 12, 2020
DrahtBot added the label Needs rebase on Nov 9, 2020
MarcoFalke deleted a comment on Nov 9, 2020
MarcoFalke deleted a comment on Nov 9, 2020
build: Abstract release tarball generation to a utility script make_release_tarball 827b1b61c9
build: Run autogen & distclean when generating source tarball 1a606ef885

Bugfix: Only use git for build info if the repository is actually the right one

Original-Github-Pull: #7522
Rebased-From: e98e3dde6a976a2c8f266ee963d6931fd4b37262 e98e3dde6a976a2c8f266ee963d6931fd4b37262

4ea29f2e88

build: Include tag name in release tarball for build.h e09ae1176b
luke-jr force-pushed on Nov 13, 2020
luke-jr force-pushed on Nov 13, 2020
luke-jr force-pushed on Nov 13, 2020
DrahtBot removed the label Needs rebase on Nov 13, 2020
DrahtBot added the label Needs rebase on Feb 8, 2021
DrahtBot commented at 11:56 AM on February 8, 2021: member



🐙 This pull request conflicts with the target branch and needs rebase.

<sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>
MarcoFalke commented at 12:00 PM on October 22, 2021: member

Closing for now. This needs rebase and there hasn't been any activity for months.

You can leave a comment if you want this to be reopened. (Or create a new pull, since there haven't been any comments here). Though, please make sure the code is passing tests and is ready for review.
MarcoFalke closed this on Oct 22, 2021
DrahtBot locked this on Oct 30, 2022

Contributors

luke-jr

DrahtBot

MarcoFalke

Labels

Build system Needs rebase

Linked (view graph)

#7522 Bugfix: Only use git for build info if the repository is actually the right one #18349 build: Fix quick hack for version string in releases #18556 build: Drop make dist in gitian builds #18818 Fix release tarball generated by gitian #18909 [0.20] Fix release tarball #18980 build: Decouple clientversion.cpp from the git repo

Bugfix: Only use git for build info if the repository is actually the right one #18902

Conflicts