move dev-cmd/bottle methods to extend/os
#14479
Conversation
hyuraku
changed the title
dev-cmd/bottle methods to extend/os
| def setup_tar_and_args!(args, mtime) | ||
| # Without --only-json-tab bottles are never reproducible | ||
| default_tar_args = ["tar", [].freeze].freeze | ||
| return default_tar_args unless args.only_json_tab? | ||
|
|
||
| # Ensure tar is set up for reproducibility. | ||
| # https://reproducible-builds.org/docs/archives/ | ||
| gnutar_args = [ | ||
| "--format", "pax", "--owner", "0", "--group", "0", "--sort", "name", "--mtime=#{mtime}", | ||
| # Set exthdr names to exclude PID (for GNU tar <1.33). Also don't store atime and ctime. | ||
| "--pax-option", "globexthdr.name=/GlobalHead.%n,exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime" | ||
| ].freeze | ||
|
|
||
| ["tar", gnutar_args].freeze | ||
| end | ||
|
|
||
| def formula_ignores(f) |
There was a problem hiding this comment.
Nice work! I think both these methods would ideally call the existing ones first e.g. with the alias generic_setup_tar_and_args! setup_tar_and_args! patterns you can see used elsewhere. Shout if you want help with that!
|
|
||
| # Ensure tar is set up for reproducibility. | ||
| # https://reproducible-builds.org/docs/archives/ | ||
| gnutar_args = [ |
There was a problem hiding this comment.
I think it'd be good to share this method too given it's the same? Could add a new gnutar_args method to bottle.rb
There was a problem hiding this comment.
Looks great, nice work @hyuraku! Waiting until 4.0.0 to merge.
|
@hyuraku unfortunately this seems to have broken bottling on Linux: https://github.com/Homebrew/brew/actions/runs/4112820830/jobs/7102214084#step:4:37 |
I'll look into it. |
hyuraku
force-pushed
the
apply-extend/os-to-dev-cmd/bottle
branch
from
9facab0
to
10d4f06
Compare
|
Thanks again @hyuraku! |
|
This broke bottle reproducibility. Homebrew/homebrew-core#122739 (comment) |
|
@carlocab Thanks for the heads up. For future reference: feel free to just insta-revert. |
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?move methods in
dev-cmd/bottleto extend/os because of#todo.