build: fix release name strings for gitian builds #4946

pull theuni wants to merge 1 commits into bitcoin:master from theuni:fixreleaseversion changing 1 files +1 −1
  1. theuni commented at 10:19 PM on September 19, 2014: member

    Fixes #4819

    This is a short-term fix. I'd like to address the current tangled version/string logic, but my attempts so far haven't actually improved the situation.

    Fix the symptom for now.

  2. build: fix release name strings for gitian builds
    When building from a distdir as gitian does, checking for the .git dir
    is not reliable. Instead, ask git if we're in a repo.
    c65cc8cde3
  3. BitcoinPullTester commented at 10:33 PM on September 19, 2014: none

    Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4946_c65cc8cde30dd34a81962fda51a754f1cc0bdde8/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

  4. sipa commented at 1:45 AM on September 20, 2014: member

    utACK

  5. laanwj commented at 9:34 AM on September 20, 2014: member

    I'm not sure this is the best way to go. Looking through the parent directories of the current directory for a .git directory is hardly more elegant than assuming it is in the current directory. share/genbuild.sh takes a srcroot argument, could we use that to determine where to look for the .git directory?

  6. theuni commented at 5:31 PM on September 22, 2014: member

    Yea, that's what makes this so twisty. When we build from this dir, we're not actually in a git repo, we're in an extracted tarball. That's done to ensure that we're building from the same release tarball that we actually distribute.

    So, the srcroot doesn't actually have a .git dir in it either. It only works because we've extracted this dir below a git repo.

    What needs to happen is that a new file is created for tarballs, which is used as a fall-back when not using git. Similar to how git-version-gen scripts work. Like I said, I hacked on that some, but it only tangled things further.

    If you'd like to ignore this and wait for a rework of the logic that's fine, I just didn't want to ignore the broken-ness for now. If nothing else, this fixes gitian builds.

  7. laanwj added the label Build system on Sep 23, 2014
  8. laanwj merged this on Sep 25, 2014
  9. laanwj closed this on Sep 25, 2014

  10. laanwj referenced this in commit 35e5b5329a on Sep 25, 2014
  11. MarcoFalke locked this on Sep 8, 2021

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: 2026-04-14 18:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me