build: Move guix time machine to prelude #24489

laanwj commented at 10:23 AM on March 7, 2022: member

This deduplicates some code, and enforces consistency of the time machine configuration between scripts.

build: Move guix time machine to prelude

This deduplicates some code, and enforces consistency of the time
machine configuration between scripts.

6833aceac9

laanwj added the label Build system on Mar 7, 2022

jonatack commented at 10:28 AM on March 7, 2022: member

Concept ACK. The two removed sections are the same as the added section.

MarcoFalke added the label DrahtBot Guix build requested on Mar 7, 2022

in contrib/guix/libexec/prelude.bash:59 in 6833aceac9

  54 | +                      --commit=ae03f401381e956c4c41b4cf495cbde964fa43d0 \
  55 | +                      --cores="$JOBS" \
  56 | +                      --keep-failed \
  57 | +                      --fallback \
  58 | +                      ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \
  59 | +                      ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_TIMEMACHINE_FLAGS} \

laanwj commented at 10:46 AM on March 7, 2022:

I've checked and all these flags come from the user (and are documented in README.md), not from the script itself.

fanquake commented at 12:02 PM on March 7, 2022: member

Guix Build:

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
155fcdd2203668e57bd0015cabdc39ae3baf235f94a3f3d02fcc7bcde3de981e  guix-build-6833aceac97d/output/aarch64-linux-gnu/SHA256SUMS.part
d520853cd5be19e6d760fa4cca78ecb48382e652b5d810872d164fa3b7f0e7be  guix-build-6833aceac97d/output/aarch64-linux-gnu/bitcoin-6833aceac97d-aarch64-linux-gnu-debug.tar.gz
918a83e18e37685e11d9618dd3bdfe8697fb176f3e724fc351572bb84436326f  guix-build-6833aceac97d/output/aarch64-linux-gnu/bitcoin-6833aceac97d-aarch64-linux-gnu.tar.gz
f3eb59ae3d8a262cbece8c3d7ec2e7710fe4c6b6e71eaed59e2211935404104b  guix-build-6833aceac97d/output/arm-linux-gnueabihf/SHA256SUMS.part
f0add7e0e11b39561ec2913684b782c85a452036463970aa83be747a0356c37e  guix-build-6833aceac97d/output/arm-linux-gnueabihf/bitcoin-6833aceac97d-arm-linux-gnueabihf-debug.tar.gz
fe997e7cb644b50c2566e68ef2492c00f5d4f8f04ca256af95417f0de029437e  guix-build-6833aceac97d/output/arm-linux-gnueabihf/bitcoin-6833aceac97d-arm-linux-gnueabihf.tar.gz
417cb920b8e8ca441b22c17000e0f5d9142c989cbcb1ba0e5e4d5eaef7ce2dce  guix-build-6833aceac97d/output/arm64-apple-darwin/SHA256SUMS.part
1722e9c7c390057c245c07afa4b91e89090122be5fe50a352135dfe604cad524  guix-build-6833aceac97d/output/arm64-apple-darwin/bitcoin-6833aceac97d-arm64-apple-darwin.tar.gz
5f835ef3eb75fda045efb388665edaad7bfc48b4ab37f0e1aa427491b8cc7c20  guix-build-6833aceac97d/output/arm64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.dmg
27b23fa46d020537de5195245ff7f27d1017dd93ea88527fca5a3bf281265b65  guix-build-6833aceac97d/output/arm64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.tar.gz
42fa984604d9bfd3b34c85a5af5c885de23d2142c15093af4bd37b35ca4bdecf  guix-build-6833aceac97d/output/dist-archive/bitcoin-6833aceac97d.tar.gz
d9bff63671e92686a3c473f76545264f844813cfe7fbc7b15fc53b7583230555  guix-build-6833aceac97d/output/powerpc64-linux-gnu/SHA256SUMS.part
cc96356c0c26fa68557e8548a1acb0344980021c14a72ac22684c0a6e9658758  guix-build-6833aceac97d/output/powerpc64-linux-gnu/bitcoin-6833aceac97d-powerpc64-linux-gnu-debug.tar.gz
e7c68fec3e640a7c526ed3eaf3b88e0b4c4b0e722c6841f543001ac546657039  guix-build-6833aceac97d/output/powerpc64-linux-gnu/bitcoin-6833aceac97d-powerpc64-linux-gnu.tar.gz
5f4e99cfd7fb126fb68b5b94b070d2a724b456103f595565b85e2a93b87e6302  guix-build-6833aceac97d/output/powerpc64le-linux-gnu/SHA256SUMS.part
136418256a02dffd457940fb60b23aeacdf7bd7b3088947f22db99f61698177e  guix-build-6833aceac97d/output/powerpc64le-linux-gnu/bitcoin-6833aceac97d-powerpc64le-linux-gnu-debug.tar.gz
b366a58685075adf6d9881e8ec4e29bfe5d44c72962c7de9ed61b15099c68c13  guix-build-6833aceac97d/output/powerpc64le-linux-gnu/bitcoin-6833aceac97d-powerpc64le-linux-gnu.tar.gz
e47f602248c0c67fc65a0e704fd3c50ccdc20288e9f37703d08e90af56d764b1  guix-build-6833aceac97d/output/riscv64-linux-gnu/SHA256SUMS.part
524d6236fa3c401effd13f7027b968c1fc9834e8e6f9e67b02553009085c2f9d  guix-build-6833aceac97d/output/riscv64-linux-gnu/bitcoin-6833aceac97d-riscv64-linux-gnu-debug.tar.gz
000dcb6106da49c8f200768bcc70b7a00ada5d50d21ffa9afac097c8dc340bd7  guix-build-6833aceac97d/output/riscv64-linux-gnu/bitcoin-6833aceac97d-riscv64-linux-gnu.tar.gz
4c4055ba640481254e84c0cb2802fee9892d85289a76db2b89fd43de41c45f42  guix-build-6833aceac97d/output/x86_64-apple-darwin/SHA256SUMS.part
38b59695bdf2a4ed216c7aabe6da4aefa1b5db2afacac8ee9d92e0eb7229d21d  guix-build-6833aceac97d/output/x86_64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.dmg
b1efd3d59369ddad3cfbb4d437e3a6ee5653738075dfca5c770894e2896c1c1e  guix-build-6833aceac97d/output/x86_64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.tar.gz
df1e822b041024435c6f98fa4dc29429e70946d12710357b90dddbf70b1ea750  guix-build-6833aceac97d/output/x86_64-apple-darwin/bitcoin-6833aceac97d-osx64.tar.gz
96fa2cb73fc2305268e17c3509f8deeae9bc2c947a3f65feb279219e083140ba  guix-build-6833aceac97d/output/x86_64-linux-gnu/SHA256SUMS.part
c8a8c4056e2694eba0ac2b2c186e7b793eede84acf237a5db30d99e97f1513a0  guix-build-6833aceac97d/output/x86_64-linux-gnu/bitcoin-6833aceac97d-x86_64-linux-gnu-debug.tar.gz
295d96477e286996de2301993016f133c744153b6895a4c25da6ac9c90a85f7b  guix-build-6833aceac97d/output/x86_64-linux-gnu/bitcoin-6833aceac97d-x86_64-linux-gnu.tar.gz
9b73b4e42b13e33c2b10273ac7d30837c1163e770b32e531541ccef4a7097394  guix-build-6833aceac97d/output/x86_64-w64-mingw32/SHA256SUMS.part
56926b9ebe74acfc0e92a57cc9eba065a98ccd1fc4e360b06ff6252ea33cf237  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win-unsigned.tar.gz
c402149cc3ffb546e7405a8c3f7883220dec3f86abb7b305f9912942bb026beb  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win64-debug.zip
85fc02766a30e0b5ab70605cf46a8bb725a1aef9cf802a71af9495eab5d3d4f6  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win64-setup-unsigned.exe
dcc110bc55d79f40cc0efb0638bcb84b559a0d94f4745bf418a664f686b00673  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win64.zip

achow101 commented at 12:20 PM on March 7, 2022: member

ACK 6833aceac97dd170970338f0bde5029f7d7aaa03

achow101 commented at 12:21 PM on March 7, 2022: member

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum                                                                                                                                               07:20:08 AM
155fcdd2203668e57bd0015cabdc39ae3baf235f94a3f3d02fcc7bcde3de981e  guix-build-6833aceac97d/output/aarch64-linux-gnu/SHA256SUMS.part
d520853cd5be19e6d760fa4cca78ecb48382e652b5d810872d164fa3b7f0e7be  guix-build-6833aceac97d/output/aarch64-linux-gnu/bitcoin-6833aceac97d-aarch64-linux-gnu-debug.tar.gz
918a83e18e37685e11d9618dd3bdfe8697fb176f3e724fc351572bb84436326f  guix-build-6833aceac97d/output/aarch64-linux-gnu/bitcoin-6833aceac97d-aarch64-linux-gnu.tar.gz
f3eb59ae3d8a262cbece8c3d7ec2e7710fe4c6b6e71eaed59e2211935404104b  guix-build-6833aceac97d/output/arm-linux-gnueabihf/SHA256SUMS.part
f0add7e0e11b39561ec2913684b782c85a452036463970aa83be747a0356c37e  guix-build-6833aceac97d/output/arm-linux-gnueabihf/bitcoin-6833aceac97d-arm-linux-gnueabihf-debug.tar.gz
fe997e7cb644b50c2566e68ef2492c00f5d4f8f04ca256af95417f0de029437e  guix-build-6833aceac97d/output/arm-linux-gnueabihf/bitcoin-6833aceac97d-arm-linux-gnueabihf.tar.gz
417cb920b8e8ca441b22c17000e0f5d9142c989cbcb1ba0e5e4d5eaef7ce2dce  guix-build-6833aceac97d/output/arm64-apple-darwin/SHA256SUMS.part
1722e9c7c390057c245c07afa4b91e89090122be5fe50a352135dfe604cad524  guix-build-6833aceac97d/output/arm64-apple-darwin/bitcoin-6833aceac97d-arm64-apple-darwin.tar.gz
5f835ef3eb75fda045efb388665edaad7bfc48b4ab37f0e1aa427491b8cc7c20  guix-build-6833aceac97d/output/arm64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.dmg
27b23fa46d020537de5195245ff7f27d1017dd93ea88527fca5a3bf281265b65  guix-build-6833aceac97d/output/arm64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.tar.gz
42fa984604d9bfd3b34c85a5af5c885de23d2142c15093af4bd37b35ca4bdecf  guix-build-6833aceac97d/output/dist-archive/bitcoin-6833aceac97d.tar.gz
d9bff63671e92686a3c473f76545264f844813cfe7fbc7b15fc53b7583230555  guix-build-6833aceac97d/output/powerpc64-linux-gnu/SHA256SUMS.part
cc96356c0c26fa68557e8548a1acb0344980021c14a72ac22684c0a6e9658758  guix-build-6833aceac97d/output/powerpc64-linux-gnu/bitcoin-6833aceac97d-powerpc64-linux-gnu-debug.tar.gz
e7c68fec3e640a7c526ed3eaf3b88e0b4c4b0e722c6841f543001ac546657039  guix-build-6833aceac97d/output/powerpc64-linux-gnu/bitcoin-6833aceac97d-powerpc64-linux-gnu.tar.gz
5f4e99cfd7fb126fb68b5b94b070d2a724b456103f595565b85e2a93b87e6302  guix-build-6833aceac97d/output/powerpc64le-linux-gnu/SHA256SUMS.part
136418256a02dffd457940fb60b23aeacdf7bd7b3088947f22db99f61698177e  guix-build-6833aceac97d/output/powerpc64le-linux-gnu/bitcoin-6833aceac97d-powerpc64le-linux-gnu-debug.tar.gz
b366a58685075adf6d9881e8ec4e29bfe5d44c72962c7de9ed61b15099c68c13  guix-build-6833aceac97d/output/powerpc64le-linux-gnu/bitcoin-6833aceac97d-powerpc64le-linux-gnu.tar.gz
e47f602248c0c67fc65a0e704fd3c50ccdc20288e9f37703d08e90af56d764b1  guix-build-6833aceac97d/output/riscv64-linux-gnu/SHA256SUMS.part
524d6236fa3c401effd13f7027b968c1fc9834e8e6f9e67b02553009085c2f9d  guix-build-6833aceac97d/output/riscv64-linux-gnu/bitcoin-6833aceac97d-riscv64-linux-gnu-debug.tar.gz
000dcb6106da49c8f200768bcc70b7a00ada5d50d21ffa9afac097c8dc340bd7  guix-build-6833aceac97d/output/riscv64-linux-gnu/bitcoin-6833aceac97d-riscv64-linux-gnu.tar.gz
4c4055ba640481254e84c0cb2802fee9892d85289a76db2b89fd43de41c45f42  guix-build-6833aceac97d/output/x86_64-apple-darwin/SHA256SUMS.part
38b59695bdf2a4ed216c7aabe6da4aefa1b5db2afacac8ee9d92e0eb7229d21d  guix-build-6833aceac97d/output/x86_64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.dmg
b1efd3d59369ddad3cfbb4d437e3a6ee5653738075dfca5c770894e2896c1c1e  guix-build-6833aceac97d/output/x86_64-apple-darwin/bitcoin-6833aceac97d-osx-unsigned.tar.gz
df1e822b041024435c6f98fa4dc29429e70946d12710357b90dddbf70b1ea750  guix-build-6833aceac97d/output/x86_64-apple-darwin/bitcoin-6833aceac97d-osx64.tar.gz
96fa2cb73fc2305268e17c3509f8deeae9bc2c947a3f65feb279219e083140ba  guix-build-6833aceac97d/output/x86_64-linux-gnu/SHA256SUMS.part
c8a8c4056e2694eba0ac2b2c186e7b793eede84acf237a5db30d99e97f1513a0  guix-build-6833aceac97d/output/x86_64-linux-gnu/bitcoin-6833aceac97d-x86_64-linux-gnu-debug.tar.gz
295d96477e286996de2301993016f133c744153b6895a4c25da6ac9c90a85f7b  guix-build-6833aceac97d/output/x86_64-linux-gnu/bitcoin-6833aceac97d-x86_64-linux-gnu.tar.gz
9b73b4e42b13e33c2b10273ac7d30837c1163e770b32e531541ccef4a7097394  guix-build-6833aceac97d/output/x86_64-w64-mingw32/SHA256SUMS.part
56926b9ebe74acfc0e92a57cc9eba065a98ccd1fc4e360b06ff6252ea33cf237  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win-unsigned.tar.gz
c402149cc3ffb546e7405a8c3f7883220dec3f86abb7b305f9912942bb026beb  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win64-debug.zip
85fc02766a30e0b5ab70605cf46a8bb725a1aef9cf802a71af9495eab5d3d4f6  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win64-setup-unsigned.exe
dcc110bc55d79f40cc0efb0638bcb84b559a0d94f4745bf418a664f686b00673  guix-build-6833aceac97d/output/x86_64-w64-mingw32/bitcoin-6833aceac97d-win64.zip

dongcarl commented at 2:33 PM on March 7, 2022: member

ACK 6833aceac97dd170970338f0bde5029f7d7aaa03

fanquake merged this on Mar 7, 2022

fanquake closed this on Mar 7, 2022

sidhujag referenced this in commit c3aa9d8a1d on Mar 7, 2022

DrahtBot commented at 6:13 PM on March 9, 2022: member

Guix builds

File	commit b9894a13083c6ad7085d735c9c514edf3c8e6471<br>(master)	commit 034aff2f4ae6182b5737ba0f4d4900f46c09a04b<br>(master and this pull)
SHA256SUMS.part	`e0e5c846897f3b02...`	`adc294112149a0e9...`
*-aarch64-linux-gnu-debug.tar.gz	`3f5ae45a3c7f77b9...`	`dbf8b637ff08c16d...`
*-aarch64-linux-gnu.tar.gz	`fe73be46216e7cdc...`	`99cb3ea0c96e06f2...`
*-arm-linux-gnueabihf-debug.tar.gz	`15d50a6ecf23e9ec...`	`6b80916246672ba5...`
*-arm-linux-gnueabihf.tar.gz	`efb87fafd6a9c411...`	`abca715861352ea6...`
*-arm64-apple-darwin.tar.gz	`ea2d9986d0e229b9...`	`7aaa39bc5c1bfee1...`
*-osx-unsigned.dmg	`59c99d1512e259e4...`	`03fee139dff11f0d...`
*-osx-unsigned.tar.gz	`8172bd28958a8f94...`	`6eea2aff807a6341...`
*-osx64.tar.gz	`cd45ce6fa4c47e4a...`	`4559b6b5bc665f20...`
*-powerpc64-linux-gnu-debug.tar.gz	`bbce152c5aa94bfb...`	`93f67757b56bc2d4...`
*-powerpc64-linux-gnu.tar.gz	`d3db4c6064f20d13...`	`a52b68876c36577f...`
*-powerpc64le-linux-gnu-debug.tar.gz	`2b4cbb402f341d70...`	`a9e44adc68f13f4f...`
*-powerpc64le-linux-gnu.tar.gz	`b286c324fe3759cd...`	`c932179b594e7da4...`
*-riscv64-linux-gnu-debug.tar.gz	`7b2a71ededc3fc73...`	`f14b17b1be6d1ddd...`
*-riscv64-linux-gnu.tar.gz	`24a2c171e23cc5e7...`	`b8187760d3f52153...`
*-win-unsigned.tar.gz	`320b71b37702b611...`	`8f3965e2e76f6c96...`
*-win64-debug.zip	`3695d51ab612d6f3...`	`d4320decd4e2882e...`
*-win64-setup-unsigned.exe	`fb9aa8b449a96b8e...`	`15a511263bfa13c6...`
*-win64.zip	`5f60c4bc318fa70c...`	`c4525fe355a42f80...`
*-x86_64-linux-gnu-debug.tar.gz	`df3503453ce0bf48...`	`3a10f9f77a99c1f2...`
*-x86_64-linux-gnu.tar.gz	`e2af732a847f4d79...`	`017cf69c254f7101...`
*.tar.gz	`46df1e43a8ae9496...`	`793251089ab192db...`
guix_build.log	`baa2f9016f4d196a...`	`8d48390434e0bf68...`
guix_build.log.diff		`1ad638a187f5c48d...`

DrahtBot removed the label DrahtBot Guix build requested on Mar 9, 2022

DrahtBot locked this on Mar 9, 2023