guix: Make source tarball using git-archive

dongcarl commented at 5:19 pm on April 22, 2020: member

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

dongcarl added the label Build system on Apr 22, 2020

dongcarl added the label Needs gitian build on Apr 22, 2020

dongcarl added the label Needs Guix build on Apr 22, 2020

DrahtBot commented at 7:36 pm on April 22, 2020: member

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

#18818 (Fix release tarball generated by gitian by luke-jr)

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 commented at 11:11 pm on April 22, 2020: member

Concept ACK.

DrahtBot commented at 11:20 am on April 25, 2020: member

Guix builds

File	commit 64139803f1225dab26197a20314109d37fa87d5f(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 removed the label Needs Guix build on Apr 25, 2020

DrahtBot commented at 5:29 am on April 27, 2020: member

Gitian builds

File	commit 65276c7737176a5269b052ceae78dbb44b216bf4(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...`

DrahtBot removed the label Needs gitian build on Apr 27, 2020

MarcoFalke commented at 11:52 am on April 27, 2020: member

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

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

MarcoFalke approved

dongcarl force-pushed on Apr 27, 2020

fanquake referenced this in commit 65fb3dfc8d on Apr 28, 2020

MarcoFalke commented at 1:05 pm on April 28, 2020: member

Needs rebase

gitian: Limit sourced script to just assignments

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.

395c1137f6

guix: Make source tarball using git-archive f5a6ac4f48

guix: Expose GIT_COMMON_DIR in container as readonly

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.

14701604d0

nsis: Specify OutFile path only once

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

fa791da02f

dongcarl force-pushed on Apr 28, 2020

dongcarl marked this as ready for review on Apr 28, 2020

sidhujag referenced this in commit 3d6b60d09e on Apr 28, 2020

in contrib/gitian-descriptors/assign_DISTNAME:10 in f090dceeb4 outdated

 5+# A helper script to be sourced into the gitian descriptors
 6+
 7+if RECENT_TAG="$(git describe --exact-match HEAD)"; then
 8+    VERSION="${RECENT_TAG#v}"
 9+else
10+    VERSION="$(git rev-parse --short HEAD)"

MarcoFalke commented at 11:25 pm on April 28, 2020:

0    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)

MarcoFalke added the label Needs gitian build on Apr 29, 2020

MarcoFalke added the label Needs Guix build on Apr 29, 2020

MarcoFalke commented at 3:00 pm on April 29, 2020: member

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.

MarcoFalke added this to the milestone 0.21.0 on Apr 29, 2020

DrahtBot commented at 4:11 pm on April 30, 2020: member

Gitian builds

File	commit 978c5a212240fd03af13d6f72ba3c27da6298f61(master)	commit df4620517bc8735fafdd244acd4d3d9bd7b43247(master and this pull)
bitcoin-*-aarch64-linux-gnu-debug.tar.gz	`a7900f03fdbecc03...`	`4ae09bda7b056c64...`
bitcoin-*-aarch64-linux-gnu.tar.gz	`36b4ba0eff91c058...`	`b9a03d347091cbc3...`
bitcoin-*-arm-linux-gnueabihf-debug.tar.gz	`a21b10d10a75c2d2...`	`88b31adaad10142d...`
bitcoin-*-arm-linux-gnueabihf.tar.gz	`63ae46d262582c69...`	`12cf5e6bb3bb7417...`
bitcoin-*-osx-unsigned.dmg	`0422bc13b9dd88c5...`	`0e8d0cb3056f7166...`
bitcoin-*-osx64.tar.gz	`4b58e5ea071d1465...`	`a6a05410b6d244dc...`
bitcoin-*-riscv64-linux-gnu-debug.tar.gz	`26930d1065f00e44...`	`20a2ba5b3bf9c99c...`
bitcoin-*-riscv64-linux-gnu.tar.gz	`7ed0548483ac2399...`	`62443deea0ef3139...`
bitcoin-*-win64-debug.zip	`8dfb2cfac8097b8f...`
bitcoin-*-win64-setup-unsigned.exe	`2add96057ae3fbda...`
bitcoin-*-win64.zip	`fc566aacd3d3f90a...`
bitcoin-*-x86_64-linux-gnu-debug.tar.gz	`40e22958ff9865ff...`	`3dfdaf965911e58d...`
bitcoin-*-x86_64-linux-gnu.tar.gz	`3b312c2c0456391d...`	`88c9fa9afd648aa6...`
bitcoin-*.tar.gz	`d02114e741cbf83f...`	`cd0baf0809d9b1fc...`
bitcoin-core-linux-0.21-res.yml	`9c0c036a266a3022...`	`87afe8341f9f08df...`
bitcoin-core-osx-0.21-res.yml	`8aaeef8dc2d63c5b...`	`8db606a3ee43b241...`
bitcoin-core-win-0.21-res.yml	`012d9094c6b92dd8...`
linux-build.log	`94a388ad77efc68f...`	`3e6b47203e444c5a...`
osx-build.log	`cde6e82e5f552bec...`	`9aa202265844e26c...`
win-build.log	`8bc04e6d3fefaef9...`	`a9afebbe09dc05d7...`
bitcoin-core-linux-0.21-res.yml.diff		`6cfba4b6d7bed445...`
bitcoin-core-osx-0.21-res.yml.diff		`e387c0033c2c68cd...`
linux-build.log.diff		`9b998841c1477ab7...`
osx-build.log.diff		`011005f4a08a2ce2...`
win-build.log.diff		`bdfc0a57baf88d35...`

DrahtBot removed the label Needs gitian build on Apr 30, 2020

MarcoFalke commented at 4:46 pm on April 30, 2020: member

0
1 /bin/mkdir -p '/home/ubuntu/build/bitcoin/distsrc-x86_64-w64-mingw32/installed/bitcoin-df4620517b//lib/pkgconfig'
2 /usr/bin/install -c -m 644 libbitcoinconsensus.pc '/home/ubuntu/build/bitcoin/distsrc-x86_64-w64-mingw32/installed/bitcoin-df4620517b//lib/pkgconfig'
3make[2]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-w64-mingw32'
4make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-w64-mingw32'
5+ cp -f './bitcoin-*-win64-setup-unsigned.exe' /home/ubuntu/out/bitcoin-df4620517b-win64-setup-unsigned.exe
6cp: cannot stat './bitcoin-*-win64-setup-unsigned.exe': No such file or directory

rel-builds: Directly deploy win installer to OUTDIR d256f91cb1

lint: Also enable source statements for non-gitian a4f6ffa71e

guix: Remove logical cores requirement

Thanks MarcoFalke for pushing this to its limits and testing :-)

1f2c39a30e

dongcarl force-pushed on May 1, 2020

build: Accomodate makensis v2.x

Apparently the -X flag doesn't work as expected in makensis v2.x

For example:

  makensis -V2 share/setup.nsi -X'OutFile "test.exe"'

Will output:

  OutFile expects 1 parameters, got 0.
  Usage: OutFile install_output.exe

So let's instead construct the file using POSIX-compliant commands and
shell constructs

27e63e01cc

DrahtBot commented at 7:20 pm on May 1, 2020: member

Guix builds

File	commit e5b9308920a151946b83694fe1701d90316a2a9e(master)	commit e2bca461ec9f901746aa49d7dd3b7a350eaa5a46(master and this pull)
bitcoin-0.20.99-aarch64-linux-gnu-debug.tar.gz	`bfa9f239a7fe270a...`
bitcoin-0.20.99-aarch64-linux-gnu.tar.gz	`d013fc584dcdcad0...`
bitcoin-0.20.99-arm-linux-gnueabihf-debug.tar.gz	`04e65cd9842e06e3...`
bitcoin-0.20.99-arm-linux-gnueabihf.tar.gz	`ac387cc990d16cbb...`
bitcoin-0.20.99-riscv64-linux-gnu-debug.tar.gz	`652bcc7554c6e41c...`
bitcoin-0.20.99-riscv64-linux-gnu.tar.gz	`cb40c72590519edf...`
bitcoin-0.20.99-win-unsigned.tar.gz	`f0500f89bc7b736a...`
bitcoin-0.20.99-win64-debug.zip	`be8f2dd8bec85cae...`
bitcoin-0.20.99-win64-setup-unsigned.exe	`d4bc6bba8904dc65...`
bitcoin-0.20.99-win64.zip	`48a9958e63b940a3...`
bitcoin-0.20.99-x86_64-linux-gnu-debug.tar.gz	`92ef64b319a4b3b3...`
bitcoin-0.20.99-x86_64-linux-gnu.tar.gz	`592213321383a66c...`
bitcoin-0.20.99.tar.gz	`63274a6760c28139...`
guix_build.log	`af29b815b77e0759...`	`3192dbf445ebdfcd...`
bitcoin-*-aarch64-linux-gnu-debug.tar.gz		`357f6307633d6ed9...`
bitcoin-*-aarch64-linux-gnu.tar.gz		`7fad11e82de74db0...`
bitcoin-*-arm-linux-gnueabihf-debug.tar.gz		`a34ebff5bd8c287f...`
bitcoin-*-arm-linux-gnueabihf.tar.gz		`8d94f2c5e60dcb15...`
bitcoin-*-riscv64-linux-gnu-debug.tar.gz		`179453666b3c7a6f...`
bitcoin-*-riscv64-linux-gnu.tar.gz		`03ba384e81923b70...`
bitcoin-*-win-unsigned.tar.gz		`e57077da6339290c...`
bitcoin-*-win64-debug.zip		`31047d3290bed0ad...`
bitcoin-*-win64-setup-unsigned.exe		`519dae9289d1b26c...`
bitcoin-*-win64.zip		`628facb401d510c9...`
bitcoin-*-x86_64-linux-gnu-debug.tar.gz		`8fde462f6caa9724...`
bitcoin-*-x86_64-linux-gnu.tar.gz		`f75899219cbfba45...`
bitcoin-*.tar.gz		`30c90a462adacae8...`
guix_build.log.diff		`a785fce51bd0605b...`

DrahtBot removed the label Needs Guix build on May 1, 2020

fanquake added this to the "PRs" column in a project

dongcarl commented at 4:55 pm on May 4, 2020: member

Performed builds of 27e63e01c locally:

Gitian Linux:

07767a6d95964525457dd096554b703ec0d962c994afc817672834fce5ad360c1  bitcoin-27e63e01c-aarch64-linux-gnu-debug.tar.gz
129c4782d005041a8aaf0dc0e4a23b9d9ada7fe14649be20c7306e25ebc8409b6  bitcoin-27e63e01c-aarch64-linux-gnu.tar.gz
260143f3c6e890dd946c4043a0a6b3d7f7dfaad995430bfcfb967f3c65e1ed1f3  bitcoin-27e63e01c-arm-linux-gnueabihf-debug.tar.gz
3d1f12f2c46ec4de005f66c81c480edf671c1dee69b28d4768324723b8174cb9a  bitcoin-27e63e01c-arm-linux-gnueabihf.tar.gz
4ae589966cd6f060b6dd2e82d75cd8db8b069ced215b0ffe71874729568da2838  bitcoin-27e63e01c-riscv64-linux-gnu-debug.tar.gz
5f192b694117c5ced00e7d039ff653eca6cf26e034d7f413375dd09d3bfd7f95f  bitcoin-27e63e01c-riscv64-linux-gnu.tar.gz
64aa2d36209d47d930946d53103974eacf1d666ffe3bc27817a205e2b5a070acf  bitcoin-27e63e01c-x86_64-linux-gnu-debug.tar.gz
7b0535037e28aadcf826dbe7a9dc49274aa3ab8f3885ce6b0365940a13c1b7c67  bitcoin-27e63e01c-x86_64-linux-gnu.tar.gz
8a8daae18536b433d05ae7972355fc99d535f2687f2e078d1a4a0893cc2c6bf5f  src/bitcoin-27e63e01c.tar.gz
9ad9206e894818fef5d3e2c5674ef01b1f5f26ac0a820f61d051b76a6759a3ee1  bitcoin-core-linux-0.21-res.yml

Gitian Win:

0a4288e594f4bcd623b6fd43b041db2530868be4eef27a9cbeab978c1ba5a4972  bitcoin-27e63e01c-win-unsigned.tar.gz
18a9d2255b7a790b73554e15c189b306f431826f506350a2a5daabc367fe32269  bitcoin-27e63e01c-win64-debug.zip
29ce0ffcfb20213b547721b43beceff4ab4f8ffb9aed289d945a5cdbf0070e4bc  bitcoin-27e63e01c-win64-setup-unsigned.exe
3aa0427ba6c1b3ceb2343d25f07daf6191af7c1c27efac44be754af628aae1688  bitcoin-27e63e01c-win64.zip
4a8daae18536b433d05ae7972355fc99d535f2687f2e078d1a4a0893cc2c6bf5f  src/bitcoin-27e63e01c.tar.gz
593f7321989ba1d7268d8d1f0d37d0a135e281e834a070fe9eb936e1d4d62d542  bitcoin-core-win-0.21-res.yml

All available Guix architectures:

 0$ find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 125aeed36ffc1eba8aff7e12f62011575e2270f07f8c25d14ffb3d0691996d919  output/bitcoin-27e63e01c-aarch64-linux-gnu-debug.tar.gz
 27423aad2b0306a828b1dbe7eeb51c22c301298d9a6ae409c53546433374c8e29  output/bitcoin-27e63e01c-aarch64-linux-gnu.tar.gz
 3f8f027993c373698fb5f1b868769f903e246594eba69fdfe2861508828fecf0c  output/bitcoin-27e63e01c-arm-linux-gnueabihf-debug.tar.gz
 46e4c079f55024348237cd55f394db1d09a1b91b8f520e64b025984d6bb7bddb0  output/bitcoin-27e63e01c-arm-linux-gnueabihf.tar.gz
 57159dc6c2acabcf089b37a8c618e8558f68a44b24a733861c2b88c865c72b3f5  output/bitcoin-27e63e01c-riscv64-linux-gnu-debug.tar.gz
 6a85afdeff32b003f11a60831b6654a4fb1fb02b899f10392006f33fbaf2b3e4a  output/bitcoin-27e63e01c-riscv64-linux-gnu.tar.gz
 7273958496232e58fc4204b28947e8b10ebd0244f7016d0098b391574639aceca  output/bitcoin-27e63e01c-win-unsigned.tar.gz
 849844ea00fcaebb141cc5b0e6a0a135df045dec1bb79256ef0f65e2a11d8ad1d  output/bitcoin-27e63e01c-win64-debug.zip
 92c7c70a33492f17a8f35c6c7348a10ad795e85855a929196d499956b048d09a2  output/bitcoin-27e63e01c-win64-setup-unsigned.exe
108985a7d8d0b8511c2e36e050c0f006346ef66c2fb436936d083690068368efbc  output/bitcoin-27e63e01c-win64.zip
113f98116028552453e059e3761b9231bd1b98ba96f9322798c4f7f586779593f9  output/bitcoin-27e63e01c-x86_64-linux-gnu-debug.tar.gz
1282ba38c6bb96ce0716646205a4f9054c0eeff32fe223d654f5234204afa599f4  output/bitcoin-27e63e01c-x86_64-linux-gnu.tar.gz
13a8daae18536b433d05ae7972355fc99d535f2687f2e078d1a4a0893cc2c6bf5f  output/src/bitcoin-27e63e01c.tar.gz

Funnily enough, you’ll see that the source tarballs match across Gitian+Guix

rel-builds: Specify core.abbrev for git-rev-parse

Chose 12 because the kernel uses it:

  https://public-inbox.org/git/CA+55aFy0_pwtFOYS1Tmnxipw9ZkRNCQHmoYyegO00pjMiZQfbg@mail.gmail.com/raw

And also because it's a nice number.

bfe1ba2f5b

fanquake commented at 2:33 am on May 5, 2020: member

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

 0find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 125aeed36ffc1eba8aff7e12f62011575e2270f07f8c25d14ffb3d0691996d919  output/bitcoin-27e63e01c-aarch64-linux-gnu-debug.tar.gz
 27423aad2b0306a828b1dbe7eeb51c22c301298d9a6ae409c53546433374c8e29  output/bitcoin-27e63e01c-aarch64-linux-gnu.tar.gz
 3f8f027993c373698fb5f1b868769f903e246594eba69fdfe2861508828fecf0c  output/bitcoin-27e63e01c-arm-linux-gnueabihf-debug.tar.gz
 46e4c079f55024348237cd55f394db1d09a1b91b8f520e64b025984d6bb7bddb0  output/bitcoin-27e63e01c-arm-linux-gnueabihf.tar.gz
 57159dc6c2acabcf089b37a8c618e8558f68a44b24a733861c2b88c865c72b3f5  output/bitcoin-27e63e01c-riscv64-linux-gnu-debug.tar.gz
 6a85afdeff32b003f11a60831b6654a4fb1fb02b899f10392006f33fbaf2b3e4a  output/bitcoin-27e63e01c-riscv64-linux-gnu.tar.gz
 7273958496232e58fc4204b28947e8b10ebd0244f7016d0098b391574639aceca  output/bitcoin-27e63e01c-win-unsigned.tar.gz
 849844ea00fcaebb141cc5b0e6a0a135df045dec1bb79256ef0f65e2a11d8ad1d  output/bitcoin-27e63e01c-win64-debug.zip
 92c7c70a33492f17a8f35c6c7348a10ad795e85855a929196d499956b048d09a2  output/bitcoin-27e63e01c-win64-setup-unsigned.exe
108985a7d8d0b8511c2e36e050c0f006346ef66c2fb436936d083690068368efbc  output/bitcoin-27e63e01c-win64.zip
113f98116028552453e059e3761b9231bd1b98ba96f9322798c4f7f586779593f9  output/bitcoin-27e63e01c-x86_64-linux-gnu-debug.tar.gz
1282ba38c6bb96ce0716646205a4f9054c0eeff32fe223d654f5234204afa599f4  output/bitcoin-27e63e01c-x86_64-linux-gnu.tar.gz
13a8daae18536b433d05ae7972355fc99d535f2687f2e078d1a4a0893cc2c6bf5f  output/src/bitcoin-27e63e01c.tar.gz

dongcarl commented at 5:56 pm on May 5, 2020: member

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 e4d366788bc2e8dce8e6ca572fce08d913d15d6b.

dongcarl commented at 6:05 pm on May 5, 2020: member

Performed builds of bfe1ba2f5b36056e0c41edf8206b93d3d83098df locally:

Gitian Linux:

0e7509ca8cbc8b72b3796a34211243037654c70fbe29bf9b16ea1c34b36996be3  bitcoin-bfe1ba2f5b36-aarch64-linux-gnu-debug.tar.gz
154289277f8fbbc7dba36d32e81988426a2be58263aeff23f4c322f7950f42610  bitcoin-bfe1ba2f5b36-aarch64-linux-gnu.tar.gz
2ad23b89b11b0eec4f9b44d04214c2e36bec01001a46093c7952e4c66a1d44dc0  bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf-debug.tar.gz
3c6631b3b40e073e3c65c3c3afca17e3e83dd70f124a63ed5c190775f5738f379  bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf.tar.gz
4a9bc8ba2f6d7b902391ab0ec1f52833dc940fda4e339885a8ec232b6798cbbaa  bitcoin-bfe1ba2f5b36-riscv64-linux-gnu-debug.tar.gz
56ccd7017ea5c5f5c2be6c0e4e244a90e6c1af710bf6124d8714f5ff51cad5964  bitcoin-bfe1ba2f5b36-riscv64-linux-gnu.tar.gz
6c2efc0f69db9ab382d36addacddaa7787f9cbcfb06b4e382e345e62432e46bb6  bitcoin-bfe1ba2f5b36-x86_64-linux-gnu-debug.tar.gz
7f5149e26b6b769e9a1399dab647b2fea3b27c8e9468ab6a360c2e1a69eb9fa1c  bitcoin-bfe1ba2f5b36-x86_64-linux-gnu.tar.gz
81b3994890226c3cccb41cd986b2af6ef973a7470b60ab46a9496b5664ab10db0  src/bitcoin-bfe1ba2f5b36.tar.gz
92c31afb99ab451bab3027bfc43c85a1b95a63e7e4534774e2a357d286665d4f9  bitcoin-core-linux-0.21-res.yml

Gitian Win:

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

All available Guix architectures:

 0$ find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 100b0ba2bdf229d659c0326f865a9df99460b51c7b9451f8ae90f2733053a6183  output/bitcoin-bfe1ba2f5b36-aarch64-linux-gnu-debug.tar.gz
 29b882e8a282fe591edce52af1ee19c270df6a7ec89593f27e79490630fe6f33c  output/bitcoin-bfe1ba2f5b36-aarch64-linux-gnu.tar.gz
 3564ec3c9ad00fca0e02f5abc6baf98a2794a7cc894218bd934a0ca45a4f78953  output/bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf-debug.tar.gz
 4442413ddfcd3d5906f230a662b96f50d1d271b855be21429fb96d068842c7b1b  output/bitcoin-bfe1ba2f5b36-arm-linux-gnueabihf.tar.gz
 57a8c76b3046a8c8534346c73b517dd4120aa3d47dc4ffb66455cb8d1e723a7d6  output/bitcoin-bfe1ba2f5b36-riscv64-linux-gnu-debug.tar.gz
 6c2893109849d9bd1fdd9fe381b9f75d6047fe320b038647de0ea5f62055c8c60  output/bitcoin-bfe1ba2f5b36-riscv64-linux-gnu.tar.gz
 7ce3a66d52d2a1eca761be7f0888ecf1c1571b91cc9f7b25764f70f088323c8b9  output/bitcoin-bfe1ba2f5b36-win-unsigned.tar.gz
 8d49cd3847560a2109c38eead3287af211e6f3e7901c6458ee78eba87db66aef2  output/bitcoin-bfe1ba2f5b36-win64-debug.zip
 94d2b9be90dac86106aa4c66ad34080d317ed50cf276de8a088d046e603148025  output/bitcoin-bfe1ba2f5b36-win64-setup-unsigned.exe
1034edf08ece840c9b8077ca93f8cb89fe5a7bd0cab0f7d9864aa050730b1998a3  output/bitcoin-bfe1ba2f5b36-win64.zip
11c1f65264509257bd3b13159e9cf0304e4b8231ef492dc21c5fc603d1b8567aae  output/bitcoin-bfe1ba2f5b36-x86_64-linux-gnu-debug.tar.gz
12a965242e1ab129ded88a88f8109e499b60f75864f2966edce9a57127fc8e2736  output/bitcoin-bfe1ba2f5b36-x86_64-linux-gnu.tar.gz
131b3994890226c3cccb41cd986b2af6ef973a7470b60ab46a9496b5664ab10db0  output/src/bitcoin-bfe1ba2f5b36.tar.gz

MarcoFalke commented at 6:22 pm on May 5, 2020: member

@dongcarl , @fanquake This conflicts with

#18818 (Fix release tarball generated by gitian by luke-jr)

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

dongcarl commented at 11:09 pm on May 5, 2020: member

@MarcoFalke We can do this one of 2 ways:

Merge #18818 first, ship 0.20.0, then rebase this on top
Merge this first, then rebase #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 commented at 5:12 am on May 6, 2020: member

ACK bfe1ba2f5b36056e0c41edf8206b93d3d83098df - 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 merged this on May 6, 2020

fanquake closed this on May 6, 2020

MarcoFalke commented at 11:10 am on May 6, 2020: member

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

MarcoFalke removed this from the milestone 0.21.0 on May 6, 2020

MarcoFalke added this to the milestone 0.20.0 on May 6, 2020

MarcoFalke added the label Needs backport (0.20) on May 6, 2020

MarcoFalke removed the label Needs backport (0.20) on May 6, 2020

MarcoFalke removed this from the milestone 0.20.0 on May 6, 2020

in contrib/guix/libexec/build.sh:262 in bfe1ba2f5b

258@@ -264,7 +259,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
259                 cp "${DISTSRC}/doc/README_windows.txt" "${DISTNAME}/readme.txt"
260                 ;;
261             *linux*)
262-                cp "${DISTSRC}/doc/README.md" "${DISTNAME}/"
263+                cp "${DISTSRC}/README.md" "${DISTNAME}/"

MarcoFalke commented at 3:37 pm on May 6, 2020:

why is this changed?

MarcoFalke commented at 3:39 pm on May 6, 2020:

Oh, I see c4a3c25ba11b20871699e570fc7b98a7b8472503

MarcoFalke commented at 3:42 pm on May 6, 2020:

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. :shrug:

luke-jr referenced this in commit e75f3832f5 on May 7, 2020

luke-jr referenced this in commit 74b19cdd43 on May 7, 2020

luke-jr referenced this in commit 53d39f0b6a on May 7, 2020

luke-jr referenced this in commit e4193cd639 on May 7, 2020

sidhujag referenced this in commit 54e7154ccb on May 12, 2020

luke-jr referenced this in commit 62f0d73dba on May 14, 2020

luke-jr referenced this in commit 808aaf90f2 on May 14, 2020

fanquake moved this from the "PRs" to the "Done" column in a project

UdjinM6 referenced this in commit 306cb1b47a on Oct 23, 2021

UdjinM6 referenced this in commit 78b0932153 on Oct 23, 2021

UdjinM6 referenced this in commit ad65a4bed0 on Oct 23, 2021

UdjinM6 referenced this in commit 6ae5c130dd on Oct 23, 2021

UdjinM6 referenced this in commit a0d3f37d3a on Dec 4, 2021

UdjinM6 referenced this in commit c0572028e3 on Dec 4, 2021

UdjinM6 referenced this in commit 632c759352 on Dec 5, 2021

DrahtBot locked this on Feb 15, 2022

guix: Make source tarball using git-archive #18741

Conflicts

Guix builds

Gitian builds

Gitian builds

Guix builds