Clean up release-process.md and make descriptors more consistent #4271

pull Michagogo wants to merge 3 commits into bitcoin:master from Michagogo:cleanup-after-osx-gitian changing 9 files +49 −57
  1. Michagogo commented at 10:32 AM on June 2, 2014: contributor

    This addresses some (but not all) of the issues in #4185. It cleans up a few things in release-process.md (such as indents) and makes the descriptors more consistent, in terms of style and also naming (both of the descriptors and the intermediate inputs). This doesn't change any of the actual build scripts, other than to change the file names -- I didn't want to accidentally break anything, though it looks like there are a few things that could be improved and made more consistent. The big change that it would be nice if someone were to make is to switch the OS X intermediates from tarballs to zips for more consistency. I didn't do that, because I don't know the details of how tar and zip/unzip work on the command line, especially when it comes to determinism.

  2. Michagogo commented at 10:34 AM on June 2, 2014: contributor

    Note that in release-process.md, some parts still need to be updated and OS X added. I only updated the steps that each gitian builder follows.

  3. laanwj commented at 11:19 AM on June 2, 2014: member

    I'm sure there is a good reason to use .tar.gzs instead of zips for the intermediate dependencies. For example for qt-linux32-4.6.4-gitian I used a .tar.gz because I needed support for symlinks.

  4. Michagogo commented at 7:28 PM on June 5, 2014: contributor

    @laanwj Well, there may be -- but other things (such as the descriptor names) suggest that the OS X descriptors may have been made independently from the current ones, rather than in coordination, consistent with the current ones. @theuni, could you comment? Was there a specific reason you went with tarballs?

  5. theuni commented at 8:29 PM on June 5, 2014: member

    @Michagogo OSX makes extensive use of symlinks, and I was more comfortable doing that with tarballs. If zips get the job done, I don't mind using 'em.

  6. Michagogo commented at 12:11 AM on June 6, 2014: contributor

    It seems that the OS X intermediates do match... Adding that. Also, I think that before 0.9.2 becomes final, the OS X descriptor should be changed to output a source tarball, which should then be packaged into a versioned zip like Windows and Linux are atm.

  7. Michagogo commented at 12:12 AM on June 6, 2014: contributor

    @theuni Well, I don't know if they get the job done... I, personally, would prefer a switch to .zips if possible (i.e. doesn't include symlinks?), but it's not that critical.

  8. Michagogo commented at 12:33 AM on June 6, 2014: contributor

    Bleh. I'll rebase tomorrow or Sunday or something.

    On Fri, Jun 6, 2014 at 3:25 AM, BitcoinPullTester notifications@github.com wrote:

    Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/ff7ed723be85b8492a707092e030c5453a4c6f37 for test log.

    This pull does not merge cleanly onto current master

    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.

    Reply to this email directly or view it on GitHub #4271 (comment).

  9. laanwj commented at 3:52 AM on June 6, 2014: member

    @theuni If we were to standardize on any format for the intermediate dependencies (which I don't see any point of, and wouldn't give any priority), I think it'd be better to standardize on tarballs. Tar wins in capabilities, as it supports symlinks et al by default. Zip is harder to get deterministic if you enable UNIX extensions, no way to force certain permissions/ownership like tar has.

  10. theuni commented at 4:39 AM on June 6, 2014: member

    @laanwj Completely agreed (which is why I've used tarballs when given the choice), I was just trying to be agreeable here :)

  11. Michagogo commented at 6:36 AM on June 6, 2014: contributor

    Tarballs would also be fine, although there's the (very slight) benefit of being able to tell source tarballs apart from intermediate zips.

    On Fri, Jun 6, 2014 at 7:39 AM, Cory Fields notifications@github.com wrote:

    @laanwj https://github.com/laanwj Completely agreed (which is why I've used tarballs when given the choice), I was just trying to be agreeable here :)

    — Reply to this email directly or view it on GitHub #4271 (comment).

  12. laanwj commented at 6:43 AM on June 6, 2014: member

    @Michagogo Good point there, although something could be said that that distinction should not be made based on file name. The current grab-bag inputs directory is a hack in itself.

    It would be better if gitian could source from multiple inputs directories so the intermediate files could live in their own directories. Combined with support for output to a configurable directory, the move/copy step after dependency builds could be skipped completely (also making it impossible to forget it!).

  13. Clean up release-process.md and make descriptors more consistent
    This addresses some (but not all) of the issues in #4185. It cleans up a
    few things in release-process.md (such as indents) and makes the
    descriptors more consistent, in terms of style and also naming (both of
    the descriptors and the intermediate inputs). This doesn't change any of
    the actual build scripts, other than to change the file names -- I didn't
    want to accidentally break anything, though it looks like there are a few
    things that could be improved and made more consistent. The big change
    that it would be nice if someone were to make is to switch the OS X
    intermediates from tarballs to zips for more consistency. I didn't do
    that, because I don't know the details of how tar and zip/unzip work on
    the command line, especially when it comes to determinism.
    8105245ae3
  14. Add OS X intermediate hashes
    Also, reorder existing hashes to match build order
    31ea9de887
  15. Michagogo commented at 9:57 AM on June 26, 2014: contributor

    Rebased, I think.

  16. Fix a rebase conflict that accidentally got left in 17601d359d
  17. Michagogo commented at 10:56 AM on June 26, 2014: contributor

    Erm, looks like I missed one conflict when rebasing. Fixed.

  18. BitcoinPullTester commented at 12:01 PM on June 26, 2014: none

    Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4271_17601d359d8dd693cef59cd1d268c1bea0cf4d6d/ 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.

  19. laanwj commented at 11:05 AM on July 1, 2014: member

    Going to close this. @theuni is working on a lot of changes in the gitian dependency handling and pulltester and this would interfere. Any consistency changes should be taken into account then.

  20. laanwj closed this on Jul 1, 2014

  21. Michagogo commented at 12:44 PM on July 1, 2014: contributor

    @laanwj How would you feel about a version of this that doesn't include the changes to the actual descriptor filenames and output/input names, but rather is limited to the cleanup of r-p.md itself?

  22. laanwj commented at 12:47 PM on July 1, 2014: member

    No problem with pure documentation changes

  23. Michagogo commented at 1:03 PM on July 1, 2014: contributor

    @laanwj And what about the change from gitian.sigs/${VERSION}[-win|-osx] to gitian.sigs/${VERSION}-<linux|win|osx>?

  24. Michagogo referenced this in commit 462ad223d6 on Jul 1, 2014
  25. Michagogo commented at 4:35 PM on July 1, 2014: contributor

    Okay, the non-descriptor changes from this PR are now in #4449.

  26. Michagogo deleted the branch on Dec 7, 2014
  27. reddink referenced this in commit ae7b82b279 on May 27, 2020
  28. 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-17 09:15 UTC

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