Skip to content

Conversation

@dongcarl
Copy link
Contributor

@dongcarl dongcarl commented Apr 22, 2020

Based on: #18556
Related: #17595 (comment)

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 22, 2020

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

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.

@hebasto
Copy link
Member

hebasto commented Apr 22, 2020

Concept ACK.

@DrahtBot
Copy link
Contributor

Guix builds

File commit 6413980
(master)
commit 22740523206268ef37fb4f961f33c16fd90644a4
(master and this pull)
bitcoin-0.20.99-aarch64-linux-gnu-debug.tar.gz 6bb75a44881c2ba8...
bitcoin-0.20.99-aarch64-linux-gnu.tar.gz 2c282283f55221c7...
bitcoin-0.20.99-arm-linux-gnueabihf-debug.tar.gz 5d37d037df657626...
bitcoin-0.20.99-arm-linux-gnueabihf.tar.gz b4adfe8c9d4fd37a...
bitcoin-0.20.99-riscv64-linux-gnu-debug.tar.gz 5443b66e672a8165...
bitcoin-0.20.99-riscv64-linux-gnu.tar.gz d51d0338e27448cf...
bitcoin-0.20.99-win-unsigned.tar.gz 23e58ece9947bfd8...
bitcoin-0.20.99-win64-debug.zip 46a6bd4ecd9bfc7f...
bitcoin-0.20.99-win64-setup-unsigned.exe 43b87278c4423721... 0569ee6231c9336b...
bitcoin-0.20.99-win64.zip a964bfcea292950f...
bitcoin-0.20.99-x86_64-linux-gnu-debug.tar.gz 9baf255c02124711...
bitcoin-0.20.99-x86_64-linux-gnu.tar.gz a9fc5c6e0281e2cd...
bitcoin-0.20.99.tar.gz 87bd8fa3fe42407b...
guix_build.log 2de3daff642c0a78... 5b179cb0544ebf7b...
bitcoin-2274052320-aarch64-linux-gnu-debug.tar.gz f500381a4fe574d3...
bitcoin-2274052320-aarch64-linux-gnu.tar.gz a8771514d5c13068...
bitcoin-2274052320-arm-linux-gnueabihf-debug.tar.gz f1f2af869eac6fbc...
bitcoin-2274052320-arm-linux-gnueabihf.tar.gz 38977d56cda88869...
bitcoin-2274052320-riscv64-linux-gnu-debug.tar.gz 40980e8759e0642b...
bitcoin-2274052320-riscv64-linux-gnu.tar.gz 4de6836a9858dc4d...
bitcoin-2274052320-win-unsigned.tar.gz 5032f97eb11762d6...
bitcoin-2274052320-win64-debug.zip 5d0c402885310928...
bitcoin-2274052320-win64.zip e81ed4c612c67b18...
bitcoin-2274052320-x86_64-linux-gnu-debug.tar.gz 2e7893336d84e52a...
bitcoin-2274052320-x86_64-linux-gnu.tar.gz 69f5e2e8270700c4...
bitcoin-2274052320.tar.gz 71faca5ae15457ee...
guix_build.log.diff 407e40560fc7c228...

@DrahtBot
Copy link
Contributor

Gitian builds

File commit 65276c7
(master)
commit ae6b249cab3bbd4624289624236811509ec915c6
(master and this pull)
bitcoin-0.20.99-aarch64-linux-gnu-debug.tar.gz 673ecc74f832f550...
bitcoin-0.20.99-aarch64-linux-gnu.tar.gz 8cacd39d9032cfa0...
bitcoin-0.20.99-arm-linux-gnueabihf-debug.tar.gz f33c821af966c7cc...
bitcoin-0.20.99-arm-linux-gnueabihf.tar.gz 1610dfc4ad6edcc8...
bitcoin-0.20.99-osx-unsigned.dmg d9b58fd52650821b...
bitcoin-0.20.99-osx64.tar.gz 2dd8003da396d8ff...
bitcoin-0.20.99-riscv64-linux-gnu-debug.tar.gz 6ab423f10d0576b8...
bitcoin-0.20.99-riscv64-linux-gnu.tar.gz e2c3d277f9188905...
bitcoin-0.20.99-win64-debug.zip 920cfb921c277ab6...
bitcoin-0.20.99-win64-setup-unsigned.exe 499d0e7e3d66123b...
bitcoin-0.20.99-win64.zip b4c5466788c5ab31...
bitcoin-0.20.99-x86_64-linux-gnu-debug.tar.gz 771c49516716cf2f...
bitcoin-0.20.99-x86_64-linux-gnu.tar.gz 9baf50756b8e295a...
bitcoin-0.20.99.tar.gz 20db243e4a63e9be...
bitcoin-core-linux-0.21-res.yml 3764dafda91b4998... 16a0531c16e5a1f4...
bitcoin-core-osx-0.21-res.yml c908e4d8f612478d... dee5593ee71e4baf...
bitcoin-core-win-0.21-res.yml 65a1ad714e6b7e4c... 8b9603bdc69fd28c...
linux-build.log dbc67f519f1bc039... 82bffb1992afc4ce...
osx-build.log 680987f733987400... 8305bd6d2e956377...
win-build.log 861910357a3af2e6... 01af8b819a1a8b79...
bitcoin-ae6b249cab-aarch64-linux-gnu-debug.tar.gz aa644626b3659572...
bitcoin-ae6b249cab-aarch64-linux-gnu.tar.gz 68f0dc6c3b02a106...
bitcoin-ae6b249cab-arm-linux-gnueabihf-debug.tar.gz b405feed8bd1aac9...
bitcoin-ae6b249cab-arm-linux-gnueabihf.tar.gz 469d0a939e633706...
bitcoin-ae6b249cab-osx-unsigned.dmg 900b86cc06c3fd7c...
bitcoin-ae6b249cab-osx64.tar.gz 92d7d7a107b119ed...
bitcoin-ae6b249cab-riscv64-linux-gnu-debug.tar.gz 457954eeab16f4fd...
bitcoin-ae6b249cab-riscv64-linux-gnu.tar.gz 0d2acd565c0dcc5d...
bitcoin-ae6b249cab-win64-debug.zip fb5c2d3f14be75b8...
bitcoin-ae6b249cab-win64-setup-unsigned.exe d3f5264c0b1ec4d3...
bitcoin-ae6b249cab-win64.zip b4d3abdc1f2a79c9...
bitcoin-ae6b249cab-x86_64-linux-gnu-debug.tar.gz 3267fc94c49ad4f3...
bitcoin-ae6b249cab-x86_64-linux-gnu.tar.gz c9d77f5049815a1a...
bitcoin-ae6b249cab.tar.gz 7178475bd43a9a55...
bitcoin-core-linux-0.21-res.yml.diff 114310ff6f4483ff...
bitcoin-core-osx-0.21-res.yml.diff 067acb010177aa93...
bitcoin-core-win-0.21-res.yml.diff 3b7757afbfdeabab...
linux-build.log.diff 322660b7955ed8c2...
osx-build.log.diff 80d6b55cfecd4347...
win-build.log.diff 3c01c3cf5098b107...

@maflcko
Copy link
Member

maflcko commented Apr 27, 2020

You'll also need to adjust this line in guix for the correct naming:

            cp --target-directory=unsigned/ "$OUTDIR"/bitcoin-*-setup-unsigned.exe

@dongcarl dongcarl force-pushed the 2020-04-sync-guix branch 2 times, most recently from 74e8b36 to 39f12a0 Compare April 27, 2020 20:27
fanquake added a commit that referenced this pull request Apr 28, 2020
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 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 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - 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
@maflcko
Copy link
Member

maflcko commented Apr 28, 2020

Needs rebase

Previously, the sourced script would create the source tarball. Now, it
only assigns variables and the source-ing script has more flexibility in
determining what to do with these variables.

See later commit showing how this flexibility is useful in our Guix
builds.
When using worktrees or submodules, you'll see a `.git' plain text file
at the root of your working tree instead of the usual `.git' directory.

This plain text file will point to the real GIT_DIR, under the
GIT_COMMON_DIR. From experimentation, the full GIT_COMMON_DIR is
required to exist for operations such as git-archive(1), so we expose it
as readonly inside the container.
Previously, we would specify the makensis output file path twice:

  1. At the top of Makefile.am as BITCOIN_WIN_INSTALLER, and
  2. In share/setup.nsi.ini

This commit uses the -X flag of makensis to eliminate the need for the
second instance mentioned above, referring makensis directly to the
value of BITCOIN_WIN_INSTALLER
@dongcarl dongcarl force-pushed the 2020-04-sync-guix branch from 39f12a0 to eab02e3 Compare April 28, 2020 14:36
@dongcarl dongcarl marked this pull request as ready for review April 28, 2020 14:37
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 28, 2020
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#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 bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#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 bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - 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 bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
VERSION="$(git rev-parse --short HEAD)"
VERSION="$(git rev-parse --short=10 HEAD)"

Not sure what the git logic is, but I couldn't verify from the doc that this is deterministic when the git version changes (and/or the number of objects in the repo)

@maflcko
Copy link
Member

maflcko commented Apr 29, 2020

Also in the guix readme. Could you remove the requirement that guix needs two cores. I am running this on half a core and everything is fine.

@fanquake
Copy link
Member

fanquake commented May 5, 2020

Also ran a Guix build of the second to last commit here:

find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
25aeed36ffc1eba8aff7e12f62011575e2270f07f8c25d14ffb3d0691996d919  output/bitcoin-27e63e01c-aarch64-linux-gnu-debug.tar.gz
7423aad2b0306a828b1dbe7eeb51c22c301298d9a6ae409c53546433374c8e29  output/bitcoin-27e63e01c-aarch64-linux-gnu.tar.gz
f8f027993c373698fb5f1b868769f903e246594eba69fdfe2861508828fecf0c  output/bitcoin-27e63e01c-arm-linux-gnueabihf-debug.tar.gz
6e4c079f55024348237cd55f394db1d09a1b91b8f520e64b025984d6bb7bddb0  output/bitcoin-27e63e01c-arm-linux-gnueabihf.tar.gz
7159dc6c2acabcf089b37a8c618e8558f68a44b24a733861c2b88c865c72b3f5  output/bitcoin-27e63e01c-riscv64-linux-gnu-debug.tar.gz
a85afdeff32b003f11a60831b6654a4fb1fb02b899f10392006f33fbaf2b3e4a  output/bitcoin-27e63e01c-riscv64-linux-gnu.tar.gz
273958496232e58fc4204b28947e8b10ebd0244f7016d0098b391574639aceca  output/bitcoin-27e63e01c-win-unsigned.tar.gz
49844ea00fcaebb141cc5b0e6a0a135df045dec1bb79256ef0f65e2a11d8ad1d  output/bitcoin-27e63e01c-win64-debug.zip
2c7c70a33492f17a8f35c6c7348a10ad795e85855a929196d499956b048d09a2  output/bitcoin-27e63e01c-win64-setup-unsigned.exe
8985a7d8d0b8511c2e36e050c0f006346ef66c2fb436936d083690068368efbc  output/bitcoin-27e63e01c-win64.zip
3f98116028552453e059e3761b9231bd1b98ba96f9322798c4f7f586779593f9  output/bitcoin-27e63e01c-x86_64-linux-gnu-debug.tar.gz
82ba38c6bb96ce0716646205a4f9054c0eeff32fe223d654f5234204afa599f4  output/bitcoin-27e63e01c-x86_64-linux-gnu.tar.gz
a8daae18536b433d05ae7972355fc99d535f2687f2e078d1a4a0893cc2c6bf5f  output/src/bitcoin-27e63e01c.tar.gz

@dongcarl
Copy link
Contributor Author

dongcarl commented May 5, 2020

This should be good to go, let me know if there are other things to do.
Would like to get this in ASAP as Linux Guix builds has been broken in master since e4d3667.

@dongcarl
Copy link
Contributor Author

dongcarl commented May 5, 2020

Performed builds of bfe1ba2 locally:

Gitian Linux:

e7509ca8cbc8b72b3796a34211243037654c70fbe29bf9b16ea1c34b36996be3  bitcoin-bfe1ba2f5b36-aarch64-linux-gnu-debug.tar.gz
54289277f8fbbc7dba36d32e81988426a2be58263aeff23f4c322f7950f42610  bitcoin-bfe1ba2f5b36-aarch64-linux-gnu.tar.gz
ad23b89b11b0eec4f9b44d04214c2e36bec01001a46093c7952e4c66a1d44dc0  bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf-debug.tar.gz
c6631b3b40e073e3c65c3c3afca17e3e83dd70f124a63ed5c190775f5738f379  bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf.tar.gz
a9bc8ba2f6d7b902391ab0ec1f52833dc940fda4e339885a8ec232b6798cbbaa  bitcoin-bfe1ba2f5b36-riscv64-linux-gnu-debug.tar.gz
6ccd7017ea5c5f5c2be6c0e4e244a90e6c1af710bf6124d8714f5ff51cad5964  bitcoin-bfe1ba2f5b36-riscv64-linux-gnu.tar.gz
c2efc0f69db9ab382d36addacddaa7787f9cbcfb06b4e382e345e62432e46bb6  bitcoin-bfe1ba2f5b36-x86_64-linux-gnu-debug.tar.gz
f5149e26b6b769e9a1399dab647b2fea3b27c8e9468ab6a360c2e1a69eb9fa1c  bitcoin-bfe1ba2f5b36-x86_64-linux-gnu.tar.gz
1b3994890226c3cccb41cd986b2af6ef973a7470b60ab46a9496b5664ab10db0  src/bitcoin-bfe1ba2f5b36.tar.gz
2c31afb99ab451bab3027bfc43c85a1b95a63e7e4534774e2a357d286665d4f9  bitcoin-core-linux-0.21-res.yml

Gitian Win:

b1987bbfb438f7583c66ea0e86ce9828c417cf5320d7b3f2cd6082d9a63b52f1  bitcoin-bfe1ba2f5b36-win-unsigned.tar.gz
be325defbee9d508156bc0cc6d04b634946249996123b1a555776ab0c09e4814  bitcoin-bfe1ba2f5b36-win64-debug.zip
c5b2aaa41b4b50c658724bde35cd823dcb879a2bebf095abfa5d7f43729b65a7  bitcoin-bfe1ba2f5b36-win64-setup-unsigned.exe
41be646fe5e5caf324f5d01eb79fdf4a4a58b37cebc5ada6af53214718a6bdcd  bitcoin-bfe1ba2f5b36-win64.zip
1b3994890226c3cccb41cd986b2af6ef973a7470b60ab46a9496b5664ab10db0  src/bitcoin-bfe1ba2f5b36.tar.gz
5b6a9cbfe65852375a910c4f1bb7724f79a39bf6cba7a3c7ea114ab16417304e  bitcoin-core-win-0.21-res.yml

All available Guix architectures:

$ find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
00b0ba2bdf229d659c0326f865a9df99460b51c7b9451f8ae90f2733053a6183  output/bitcoin-bfe1ba2f5b36-aarch64-linux-gnu-debug.tar.gz
9b882e8a282fe591edce52af1ee19c270df6a7ec89593f27e79490630fe6f33c  output/bitcoin-bfe1ba2f5b36-aarch64-linux-gnu.tar.gz
564ec3c9ad00fca0e02f5abc6baf98a2794a7cc894218bd934a0ca45a4f78953  output/bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf-debug.tar.gz
442413ddfcd3d5906f230a662b96f50d1d271b855be21429fb96d068842c7b1b  output/bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf.tar.gz
7a8c76b3046a8c8534346c73b517dd4120aa3d47dc4ffb66455cb8d1e723a7d6  output/bitcoin-bfe1ba2f5b36-riscv64-linux-gnu-debug.tar.gz
c2893109849d9bd1fdd9fe381b9f75d6047fe320b038647de0ea5f62055c8c60  output/bitcoin-bfe1ba2f5b36-riscv64-linux-gnu.tar.gz
ce3a66d52d2a1eca761be7f0888ecf1c1571b91cc9f7b25764f70f088323c8b9  output/bitcoin-bfe1ba2f5b36-win-unsigned.tar.gz
d49cd3847560a2109c38eead3287af211e6f3e7901c6458ee78eba87db66aef2  output/bitcoin-bfe1ba2f5b36-win64-debug.zip
4d2b9be90dac86106aa4c66ad34080d317ed50cf276de8a088d046e603148025  output/bitcoin-bfe1ba2f5b36-win64-setup-unsigned.exe
34edf08ece840c9b8077ca93f8cb89fe5a7bd0cab0f7d9864aa050730b1998a3  output/bitcoin-bfe1ba2f5b36-win64.zip
c1f65264509257bd3b13159e9cf0304e4b8231ef492dc21c5fc603d1b8567aae  output/bitcoin-bfe1ba2f5b36-x86_64-linux-gnu-debug.tar.gz
a965242e1ab129ded88a88f8109e499b60f75864f2966edce9a57127fc8e2736  output/bitcoin-bfe1ba2f5b36-x86_64-linux-gnu.tar.gz
1b3994890226c3cccb41cd986b2af6ef973a7470b60ab46a9496b5664ab10db0  output/src/bitcoin-bfe1ba2f5b36.tar.gz

@maflcko
Copy link
Member

maflcko commented May 5, 2020

@dongcarl , @fanquake This conflicts with

which is tagged 0.20.0. Just saying, to be sure we don't accidentally close doors behind us.

@dongcarl
Copy link
Contributor Author

dongcarl commented May 5, 2020

@MarcoFalke We can do this one of 2 ways:

  1. Merge Fix release tarball generated by gitian #18818 first, ship 0.20.0, then rebase this on top
  2. Merge this first, then rebase Fix release tarball generated by gitian #18818 on top, then ship 0.20.0

Personally, I'd prefer the second option, as this PR is quite well-tested now, and fixes the broken Linux Guix builds (which we now ship with release tarballs since the move to git-archive). I don't think rebasing #18818 on top of this will lead to unsolvable problems.

@fanquake
Copy link
Member

fanquake commented May 6, 2020

ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase #18818.

@fanquake fanquake merged commit d96fdc2 into bitcoin:master May 6, 2020
@maflcko
Copy link
Member

maflcko commented May 6, 2020

Sorry, I don't follow. Should this pull be marked for backport then?

@maflcko maflcko modified the milestones: 0.21.0, 0.20.0 May 6, 2020
@maflcko maflcko removed this from the 0.20.0 milestone May 6, 2020
;;
*linux*)
cp "${DISTSRC}/doc/README.md" "${DISTNAME}/"
cp "${DISTSRC}/README.md" "${DISTNAME}/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see c4a3c25

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neither README make sense. The top level one talks about testing and quality assurance, which is meta for the tarball. The doc README has some dead links, but at least gives some more context. 🤷

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 12, 2020
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request May 14, 2020
Previously, the sourced script would create the source tarball. Now, it
only assigns variables and the source-ing script has more flexibility in
determining what to do with these variables.

See later commit showing how this flexibility is useful in our Guix
builds.

Github-Pull: bitcoin#18741
Rebased-From: 395c113
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request May 14, 2020
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Oct 23, 2021
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#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 bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#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 bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - 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 bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Oct 23, 2021
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Dec 4, 2021
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#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 bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#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 bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - 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 bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Dec 4, 2021
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants