diff options
author | fanquake <fanquake@gmail.com> | 2020-04-28 16:28:34 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-04-28 16:44:17 +0800 |
commit | 65fb3dfc8dc1f847b756e5ce8eac4fe45305ff0e (patch) | |
tree | 93e5e164e9d558938989543f95dd892aefbf72bd /ci/test/00_setup_env.sh | |
parent | ac21090f209cb1b8ea6cd5074d5e9c6b82ce2a7f (diff) | |
parent | 2aa48edec0101f8a77a2189244fc62722ff7a123 (diff) | |
download | bitcoin-65fb3dfc8dc1f847b756e5ce8eac4fe45305ff0e.tar.xz |
Merge #18556: build: Drop make dist in gitian builds
2aa48edec0101f8a77a2189244fc62722ff7a123 refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be044724bb49d785ca2e296a3b43343c1690 build: Drop make dist in gitian builds (Hennadii Stepanov)
Pull request description:
After the merge of #18331, the packaged source tarball is created by `git archive`, but the binaries are built from another one which is made by `make dist`.
With this PR the only source tarball, created by `git archive`, is used both for binaries building and for packaging to users.
Close #16588.
Close #18547.
As a good side-effect, #18349 becomes redundant.
**Change in behavior**
The following variables https://github.com/bitcoin/bitcoin/blob/1b151e3ffce7c1a2ee46bf280cc1d96775d1f91e/configure.ac#L2-L6
are no longer used for naming of directories and tarballs.
Instead of them the gitian descriptors use a git tag (if available) or a commit hash.
---
Also a small refactor commit picked from #18404.
ACKs for top commit:
dongcarl:
ACK 2aa48edec0101f8a77a2189244fc62722ff7a123
MarcoFalke:
ACK 2aa48edec0101f8a77a2189244fc62722ff7a123
fanquake:
ACK 2aa48edec0101f8a77a2189244fc62722ff7a123 - I've had a quick look over this, and don't want to block merging if this actually gets as closer to finally having this all sorted out. Obviously we've still got #18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).
Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
Diffstat (limited to 'ci/test/00_setup_env.sh')
0 files changed, 0 insertions, 0 deletions