Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

guix: Add guix-clean script + establish gc-root for container profiles #21304

Merged
merged 4 commits into from
Apr 8, 2021

Conversation

dongcarl
Copy link
Contributor

@dongcarl dongcarl commented Feb 26, 2021

guix: Record precious directories and add guix-clean

Many users have reported problems that stem from having an unclean
working tree. To that end, I've written a guix-clean script which should
help reset the working tree while respecting user-specified precious
directories.

Precious directories, such as:

- SOURCES_PATH
- BASE_CACHE
- SDK_PATH
- OUTDIR

Should be preserved when cleaning the working tree, and are thus
recorded in ./contrib/guix/var/precious_dirs.

The ./contrib/guix/guix-clean script is able to parse that file and make
sure to avoid them when cleaning out the working tree.

@dongcarl
Copy link
Contributor Author

dongcarl commented Mar 2, 2021

Pushed 5251e87 -> a37ea49

  • Rebased over master
  • Added commit changing int_trap hint message
bf1453775729052a349fa4651adc205d399da43a009b44db788afbd7bb5b6c9b  output/bitcoin-a37ea498f50d-aarch64-linux-gnu-debug.tar.gz
c6954e4f3c5a42ec1a6b618d614c67caea78f11471aabf11242154f1571d18db  output/bitcoin-a37ea498f50d-aarch64-linux-gnu.tar.gz
52b7ab77a5dbec454984f4f1e9c579f13eb8603438a9c6771ca68373560fea08  output/bitcoin-a37ea498f50d-arm-linux-gnueabihf-debug.tar.gz
5cb567e0bd3978c7ea5b7764eaaa37eb703b987fa14a53571790a37e072eea5a  output/bitcoin-a37ea498f50d-arm-linux-gnueabihf.tar.gz
971fae4ce37f2eb0ca1e24ee9b74364a4fdde96a9ad175fb49e758e9dadaf678  output/bitcoin-a37ea498f50d-osx-unsigned.dmg
7d137ef6caef4193d0dc0e23317d1eb151380fbeedf107079d6ecb1b47183ed0  output/bitcoin-a37ea498f50d-osx-unsigned.tar.gz
930435a47a45dfd15ed7bb0643a0906e912a4d0c1a16917391fca3934ecb12c0  output/bitcoin-a37ea498f50d-osx64.tar.gz
fc96378474fe8383c83a28c85495c4dedbecb4351db9c652ddb0b02f348db1fe  output/bitcoin-a37ea498f50d-powerpc64-linux-gnu-debug.tar.gz
beda70c00d708d9195218979ae1bcb62286516a34ad78f966bf871f4a061f010  output/bitcoin-a37ea498f50d-powerpc64-linux-gnu.tar.gz
7cb0cb1581a27d088e9b5b15fb535c2c8b06f4e019072965f2409bbef0cc0c62  output/bitcoin-a37ea498f50d-powerpc64le-linux-gnu-debug.tar.gz
2af510e7c65e28ec6a506280b35ed98b956292f3959126c561375de82b853341  output/bitcoin-a37ea498f50d-powerpc64le-linux-gnu.tar.gz
255c9313e05a13abba58294d51cf63e99601d734e8f60aa94623a6f9d19a02da  output/bitcoin-a37ea498f50d-riscv64-linux-gnu-debug.tar.gz
a5c971f9a17b87748faab0431091b3ec79fd4d29cedbbead805840bdfe2ede07  output/bitcoin-a37ea498f50d-riscv64-linux-gnu.tar.gz
be12a14d6ec40669a4435c25fdb47299f890b7f598db8875b1880d300c80ad26  output/bitcoin-a37ea498f50d-win-unsigned.tar.gz
bb92a39b41022b30fb9335bf87e2d537ea05ff9051965ab831bbd8f97e46546a  output/bitcoin-a37ea498f50d-win64-debug.zip
39f0435bd54db7405099011e8e15cb68c82b648b33f448a1517d42aab394e946  output/bitcoin-a37ea498f50d-win64-setup-unsigned.exe
f11c84470aceee85e519b04652c493707fee31f8a4c59372805aed4847f2055f  output/bitcoin-a37ea498f50d-win64.zip
328bdf0f6346fab1f26a1976c1eca2ee94944b5e603a5ab99ae77a10f0f6d228  output/bitcoin-a37ea498f50d-x86_64-linux-gnu-debug.tar.gz
89911beff8eff157669862c3bb0ed4b23a6b6d00431b0f654c61241b51927d69  output/bitcoin-a37ea498f50d-x86_64-linux-gnu.tar.gz
cf4878ce7bfb2d6a9b1340b00e10cb7801dcc1390dc6d866d47757333b5e8cd5  output/src/bitcoin-a37ea498f50d.tar.gz

@laanwj
Copy link
Member

laanwj commented Mar 4, 2021

Tested ACK:

guest@gnu ~/bitcoin$ ./contrib/guix/guix-clean
Avoiding OUTDIR: /output
Removing depends/aarch64-linux-gnu/
Removing depends/arm-linux-gnueabihf/
Removing depends/powerpc64-linux-gnu/
Removing depends/powerpc64le-linux-gnu/
Removing depends/riscv64-linux-gnu/
Removing depends/work/
Removing depends/x86_64-apple-darwin18/
Removing depends/x86_64-linux-gnu/
Removing depends/x86_64-w64-mingw32/
Removing distsrc-a37ea498f50d-aarch64-linux-gnu/
Removing distsrc-a37ea498f50d-arm-linux-gnueabihf/
Removing distsrc-a37ea498f50d-powerpc64-linux-gnu/
Removing distsrc-a37ea498f50d-powerpc64le-linux-gnu/
Removing distsrc-a37ea498f50d-riscv64-linux-gnu/
Removing distsrc-a37ea498f50d-x86_64-apple-darwin18/
Removing distsrc-a37ea498f50d-x86_64-linux-gnu/
Removing distsrc-a37ea498f50d-x86_64-w64-mingw32/

(while the other precious directories are outside the repository, it correctly identifies output being inside)

I think the new script needs to be mentioned in some documentation.

@dongcarl
Copy link
Contributor Author

dongcarl commented Mar 5, 2021

Hmmm, thinking about this right now. I probably should not remove the precious_dirs file at the end of guix-clean, as the use might accidentally invoke guix-clean again, and that would blow away their depends cache.

53ad68a#diff-f1513e6be804cc7243e0565d540858ad0dd41738d10838bfb9b23c3880524b26R71

@fanquake
Copy link
Member

fanquake commented Mar 6, 2021

Tested this out a bit.

Fully clean tree. Build for macOS (most convoluted):

HOSTS="x86_64-apple-darwin18" BASE_CACHE="/guix/base_cache" SOURCES_PATH="/guix/sources" SDK_PATH="/guix/SDKs" ./contrib/guix/guix-build.sh

# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
971fae4ce37f2eb0ca1e24ee9b74364a4fdde96a9ad175fb49e758e9dadaf678  output/bitcoin-a37ea498f50d-osx-unsigned.dmg
7d137ef6caef4193d0dc0e23317d1eb151380fbeedf107079d6ecb1b47183ed0  output/bitcoin-a37ea498f50d-osx-unsigned.tar.gz
930435a47a45dfd15ed7bb0643a0906e912a4d0c1a16917391fca3934ecb12c0  output/bitcoin-a37ea498f50d-osx64.tar.gz
cf4878ce7bfb2d6a9b1340b00e10cb7801dcc1390dc6d866d47757333b5e8cd5  output/src/bitcoin-a37ea498f50d.tar.gz

./contrib/guix/guix-clean
Avoiding OUTDIR: /output
Removing depends/work/
Removing depends/x86_64-apple-darwin18/
Removing distsrc-a37ea498f50d-x86_64-apple-darwin18/

Perform the same build again:

HOSTS="x86_64-apple-darwin18" BASE_CACHE="/guix/base_cache" SOURCES_PATH="/guix/sources" SDK_PATH="/guix/SDKs" ./contrib/guix/guix-build.sh

# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
971fae4ce37f2eb0ca1e24ee9b74364a4fdde96a9ad175fb49e758e9dadaf678  output/bitcoin-a37ea498f50d-osx-unsigned.dmg
7d137ef6caef4193d0dc0e23317d1eb151380fbeedf107079d6ecb1b47183ed0  output/bitcoin-a37ea498f50d-osx-unsigned.tar.gz
930435a47a45dfd15ed7bb0643a0906e912a4d0c1a16917391fca3934ecb12c0  output/bitcoin-a37ea498f50d-osx64.tar.gz
cf4878ce7bfb2d6a9b1340b00e10cb7801dcc1390dc6d866d47757333b5e8cd5  output/src/bitcoin-a37ea498f50d.tar.gz

./contrib/guix/guix-clean
Avoiding OUTDIR: /output
Removing depends/x86_64-apple-darwin18/
Removing distsrc-a37ea498f50d-x86_64-apple-darwin18/

Build everything:

BASE_CACHE="/guix/base_cache" SOURCES_PATH="/guix/sources" SDK_PATH="/guix/SDKs" ./contrib/guix/guix-build.sh

# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
bf1453775729052a349fa4651adc205d399da43a009b44db788afbd7bb5b6c9b  output/bitcoin-a37ea498f50d-aarch64-linux-gnu-debug.tar.gz
c6954e4f3c5a42ec1a6b618d614c67caea78f11471aabf11242154f1571d18db  output/bitcoin-a37ea498f50d-aarch64-linux-gnu.tar.gz
52b7ab77a5dbec454984f4f1e9c579f13eb8603438a9c6771ca68373560fea08  output/bitcoin-a37ea498f50d-arm-linux-gnueabihf-debug.tar.gz
5cb567e0bd3978c7ea5b7764eaaa37eb703b987fa14a53571790a37e072eea5a  output/bitcoin-a37ea498f50d-arm-linux-gnueabihf.tar.gz
971fae4ce37f2eb0ca1e24ee9b74364a4fdde96a9ad175fb49e758e9dadaf678  output/bitcoin-a37ea498f50d-osx-unsigned.dmg
7d137ef6caef4193d0dc0e23317d1eb151380fbeedf107079d6ecb1b47183ed0  output/bitcoin-a37ea498f50d-osx-unsigned.tar.gz
930435a47a45dfd15ed7bb0643a0906e912a4d0c1a16917391fca3934ecb12c0  output/bitcoin-a37ea498f50d-osx64.tar.gz
fc96378474fe8383c83a28c85495c4dedbecb4351db9c652ddb0b02f348db1fe  output/bitcoin-a37ea498f50d-powerpc64-linux-gnu-debug.tar.gz
beda70c00d708d9195218979ae1bcb62286516a34ad78f966bf871f4a061f010  output/bitcoin-a37ea498f50d-powerpc64-linux-gnu.tar.gz
7cb0cb1581a27d088e9b5b15fb535c2c8b06f4e019072965f2409bbef0cc0c62  output/bitcoin-a37ea498f50d-powerpc64le-linux-gnu-debug.tar.gz
2af510e7c65e28ec6a506280b35ed98b956292f3959126c561375de82b853341  output/bitcoin-a37ea498f50d-powerpc64le-linux-gnu.tar.gz
255c9313e05a13abba58294d51cf63e99601d734e8f60aa94623a6f9d19a02da  output/bitcoin-a37ea498f50d-riscv64-linux-gnu-debug.tar.gz
a5c971f9a17b87748faab0431091b3ec79fd4d29cedbbead805840bdfe2ede07  output/bitcoin-a37ea498f50d-riscv64-linux-gnu.tar.gz
be12a14d6ec40669a4435c25fdb47299f890b7f598db8875b1880d300c80ad26  output/bitcoin-a37ea498f50d-win-unsigned.tar.gz
bb92a39b41022b30fb9335bf87e2d537ea05ff9051965ab831bbd8f97e46546a  output/bitcoin-a37ea498f50d-win64-debug.zip
39f0435bd54db7405099011e8e15cb68c82b648b33f448a1517d42aab394e946  output/bitcoin-a37ea498f50d-win64-setup-unsigned.exe
f11c84470aceee85e519b04652c493707fee31f8a4c59372805aed4847f2055f  output/bitcoin-a37ea498f50d-win64.zip
328bdf0f6346fab1f26a1976c1eca2ee94944b5e603a5ab99ae77a10f0f6d228  output/bitcoin-a37ea498f50d-x86_64-linux-gnu-debug.tar.gz
89911beff8eff157669862c3bb0ed4b23a6b6d00431b0f654c61241b51927d69  output/bitcoin-a37ea498f50d-x86_64-linux-gnu.tar.gz
cf4878ce7bfb2d6a9b1340b00e10cb7801dcc1390dc6d866d47757333b5e8cd5  output/src/bitcoin-a37ea498f50d.tar.gz

# ./contrib/guix/guix-clean
Avoiding OUTDIR: /output
Removing depends/aarch64-linux-gnu/
Removing depends/arm-linux-gnueabihf/
Removing depends/powerpc64-linux-gnu/
Removing depends/powerpc64le-linux-gnu/
Removing depends/riscv64-linux-gnu/
Removing depends/work/
Removing depends/x86_64-apple-darwin18/
Removing depends/x86_64-linux-gnu/
Removing depends/x86_64-w64-mingw32/
Removing distsrc-a37ea498f50d-aarch64-linux-gnu/
Removing distsrc-a37ea498f50d-arm-linux-gnueabihf/
Removing distsrc-a37ea498f50d-powerpc64-linux-gnu/
Removing distsrc-a37ea498f50d-powerpc64le-linux-gnu/
Removing distsrc-a37ea498f50d-riscv64-linux-gnu/
Removing distsrc-a37ea498f50d-x86_64-apple-darwin18/
Removing distsrc-a37ea498f50d-x86_64-linux-gnu/
Removing distsrc-a37ea498f50d-x86_64-w64-mingw32/

@dongcarl dongcarl marked this pull request as draft March 6, 2021 19:24
@dongcarl
Copy link
Contributor Author

dongcarl commented Mar 6, 2021

Converted to draft as the followup in #21375 re-does a lot of this changeset, will figure out how best to split up.

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 14, 2021

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

Conflicts

No conflicts as of last run.

@dongcarl dongcarl changed the title guix: Various user workflow improvements guix: Add guix-clean script + establish gc-root for container profiles Mar 17, 2021
@dongcarl
Copy link
Contributor Author

Redid this to be based on #21375

@practicalswift
Copy link
Contributor

Concept ACK: resetting the working tree makes sense

This simplifies parsing when using these rules from scripts.
Many users have reported problems that stem from having an unclean
working tree. To that end, I've written a guix-clean script which should
help reset the working tree while respecting user-specified precious
directories.

Precious directories, such as:

- SOURCES_PATH
- BASE_CACHE
- SDK_PATH
- OUTDIR

Should be preserved when cleaning the working tree, and are thus
recorded in ./contrib/guix/var/precious_dirs.

The ./contrib/guix/guix-clean script is able to parse that file and make
sure to avoid them when cleaning out the working tree.
@dongcarl
Copy link
Contributor Author

dongcarl commented Apr 5, 2021

Rebased on master now that #21375 is merged.

@sipa
Copy link
Member

sipa commented Apr 6, 2021

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
fff480734c99417c7a12dccb7c1029ea92059e88f1d56565e6d7f8fd572aeea9  guix-build-29cc84727a2d/output/aarch64-linux-gnu/bitcoin-29cc84727a2d-aarch64-linux-gnu-debug.tar.gz
0941375d26654aa6ece7884262f1f3e0e7619ddc9eb0c8bc72c21765eac61e90  guix-build-29cc84727a2d/output/aarch64-linux-gnu/bitcoin-29cc84727a2d-aarch64-linux-gnu.tar.gz
8f9a3119393d48a26bd108e1092badcc1c9513f8b8ca3f5e38ecb5e8b950d0a9  guix-build-29cc84727a2d/output/arm-linux-gnueabihf/bitcoin-29cc84727a2d-arm-linux-gnueabihf-debug.tar.gz
ba61eb82c54915231d6df49432d35ec120dcf995fec9f4e16e1e5c0b2798ffb3  guix-build-29cc84727a2d/output/arm-linux-gnueabihf/bitcoin-29cc84727a2d-arm-linux-gnueabihf.tar.gz
fca9809a5ef9510d09fad97aafa296985d51f3970e64269f5f7c8a98703c4008  guix-build-29cc84727a2d/output/dist-archive/bitcoin-29cc84727a2d.tar.gz
413ac3039bb6205994de8f597d6586aedee740b3ecd8a0c2c3d08200e7ceff76  guix-build-29cc84727a2d/output/powerpc64-linux-gnu/bitcoin-29cc84727a2d-powerpc64-linux-gnu-debug.tar.gz
4fa874b322c1810a6782378069de167cdca63bb090c359e4c7888e37582ce109  guix-build-29cc84727a2d/output/powerpc64-linux-gnu/bitcoin-29cc84727a2d-powerpc64-linux-gnu.tar.gz
53f8136072039c98e35f40ea0ba69774c1cbfc338427e1e6236a7040e2c1d167  guix-build-29cc84727a2d/output/powerpc64le-linux-gnu/bitcoin-29cc84727a2d-powerpc64le-linux-gnu-debug.tar.gz
adb6ab9a5ee1608d111473585ae31276ef83c461a39338cec43d373a405c269c  guix-build-29cc84727a2d/output/powerpc64le-linux-gnu/bitcoin-29cc84727a2d-powerpc64le-linux-gnu.tar.gz
6ff8221f394a77c823a1ebcff2f1ce38764fa394f7aba9313aac8a534153d0b5  guix-build-29cc84727a2d/output/riscv64-linux-gnu/bitcoin-29cc84727a2d-riscv64-linux-gnu-debug.tar.gz
c7fb59e3f2924a9a0a35c82fd4066d624b2c9c845221c33cfc2d14a0a1c75a04  guix-build-29cc84727a2d/output/riscv64-linux-gnu/bitcoin-29cc84727a2d-riscv64-linux-gnu.tar.gz
ddd6ec1456ae604da95bcd543e0777fdc601ae6497a866118a81ce3e207d954d  guix-build-29cc84727a2d/output/x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx-unsigned.dmg
3490cbe63681ae7aa1ed6d3bb7fdcdfcd374da1ffe846a76bda47fcbbe652aa9  guix-build-29cc84727a2d/output/x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx-unsigned.tar.gz
3686c7d3230ced9491331a22e7b25ea330b416240d322118dcbd41d53d1a7591  guix-build-29cc84727a2d/output/x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx64.tar.gz
02a52b0697dc45da13349cde58d764bc48ac33a1c0d49aa3a0e4c5dc0689793c  guix-build-29cc84727a2d/output/x86_64-linux-gnu/bitcoin-29cc84727a2d-x86_64-linux-gnu-debug.tar.gz
745cc44d2b48d71b631ced31c10853aba0e606f060ca2e1d4e758bbbf0ce85cc  guix-build-29cc84727a2d/output/x86_64-linux-gnu/bitcoin-29cc84727a2d-x86_64-linux-gnu.tar.gz
8373e04218425c60bdacc6b18742fe30a55f87160884c75dbe3939bc6f3f46b5  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win-unsigned.tar.gz
1b0e328bf0cbbcd2e4899e75dcaa9b533def97ee2ca7f66d8373403496242371  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64-debug.zip
53cab715ba0b7b33b32aa4e5497e070ca03bc0edb7ed6ab589cb12a8a5909712  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64-setup-unsigned.exe
9ab616decb8d41e6d21f9516b32cd4aba3af328f51553f3e37aac822da8e6bc0  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64.zip

@fanquake
Copy link
Member

fanquake commented Apr 6, 2021

real	154m34.542s
user	693m25.846s
sys	50m30.485s
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
fff480734c99417c7a12dccb7c1029ea92059e88f1d56565e6d7f8fd572aeea9  guix-build-29cc84727a2d/output/aarch64-linux-gnu/bitcoin-29cc84727a2d-aarch64-linux-gnu-debug.tar.gz
0941375d26654aa6ece7884262f1f3e0e7619ddc9eb0c8bc72c21765eac61e90  guix-build-29cc84727a2d/output/aarch64-linux-gnu/bitcoin-29cc84727a2d-aarch64-linux-gnu.tar.gz
8f9a3119393d48a26bd108e1092badcc1c9513f8b8ca3f5e38ecb5e8b950d0a9  guix-build-29cc84727a2d/output/arm-linux-gnueabihf/bitcoin-29cc84727a2d-arm-linux-gnueabihf-debug.tar.gz
ba61eb82c54915231d6df49432d35ec120dcf995fec9f4e16e1e5c0b2798ffb3  guix-build-29cc84727a2d/output/arm-linux-gnueabihf/bitcoin-29cc84727a2d-arm-linux-gnueabihf.tar.gz
fca9809a5ef9510d09fad97aafa296985d51f3970e64269f5f7c8a98703c4008  guix-build-29cc84727a2d/output/dist-archive/bitcoin-29cc84727a2d.tar.gz
413ac3039bb6205994de8f597d6586aedee740b3ecd8a0c2c3d08200e7ceff76  guix-build-29cc84727a2d/output/powerpc64-linux-gnu/bitcoin-29cc84727a2d-powerpc64-linux-gnu-debug.tar.gz
4fa874b322c1810a6782378069de167cdca63bb090c359e4c7888e37582ce109  guix-build-29cc84727a2d/output/powerpc64-linux-gnu/bitcoin-29cc84727a2d-powerpc64-linux-gnu.tar.gz
53f8136072039c98e35f40ea0ba69774c1cbfc338427e1e6236a7040e2c1d167  guix-build-29cc84727a2d/output/powerpc64le-linux-gnu/bitcoin-29cc84727a2d-powerpc64le-linux-gnu-debug.tar.gz
adb6ab9a5ee1608d111473585ae31276ef83c461a39338cec43d373a405c269c  guix-build-29cc84727a2d/output/powerpc64le-linux-gnu/bitcoin-29cc84727a2d-powerpc64le-linux-gnu.tar.gz
6ff8221f394a77c823a1ebcff2f1ce38764fa394f7aba9313aac8a534153d0b5  guix-build-29cc84727a2d/output/riscv64-linux-gnu/bitcoin-29cc84727a2d-riscv64-linux-gnu-debug.tar.gz
c7fb59e3f2924a9a0a35c82fd4066d624b2c9c845221c33cfc2d14a0a1c75a04  guix-build-29cc84727a2d/output/riscv64-linux-gnu/bitcoin-29cc84727a2d-riscv64-linux-gnu.tar.gz
ddd6ec1456ae604da95bcd543e0777fdc601ae6497a866118a81ce3e207d954d  guix-build-29cc84727a2d/output/x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx-unsigned.dmg
3490cbe63681ae7aa1ed6d3bb7fdcdfcd374da1ffe846a76bda47fcbbe652aa9  guix-build-29cc84727a2d/output/x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx-unsigned.tar.gz
3686c7d3230ced9491331a22e7b25ea330b416240d322118dcbd41d53d1a7591  guix-build-29cc84727a2d/output/x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx64.tar.gz
02a52b0697dc45da13349cde58d764bc48ac33a1c0d49aa3a0e4c5dc0689793c  guix-build-29cc84727a2d/output/x86_64-linux-gnu/bitcoin-29cc84727a2d-x86_64-linux-gnu-debug.tar.gz
745cc44d2b48d71b631ced31c10853aba0e606f060ca2e1d4e758bbbf0ce85cc  guix-build-29cc84727a2d/output/x86_64-linux-gnu/bitcoin-29cc84727a2d-x86_64-linux-gnu.tar.gz
8373e04218425c60bdacc6b18742fe30a55f87160884c75dbe3939bc6f3f46b5  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win-unsigned.tar.gz
1b0e328bf0cbbcd2e4899e75dcaa9b533def97ee2ca7f66d8373403496242371  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64-debug.zip
53cab715ba0b7b33b32aa4e5497e070ca03bc0edb7ed6ab589cb12a8a5909712  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64-setup-unsigned.exe
9ab616decb8d41e6d21f9516b32cd4aba3af328f51553f3e37aac822da8e6bc0  guix-build-29cc84727a2d/output/x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64.zip

@laanwj
Copy link
Member

laanwj commented Apr 7, 2021

You might want to mention the clean script in this message:

ERR: Build directories for this commit already exist for the following platform                                                                                                                                      
     triples you're attempting to build, probably because of previous builds.                             
     Please remove, or otherwise deal with them prior to starting another build.                                                  

Output (matches @fanquake)

cd guix-build-$(git rev-parse --short=12 HEAD)/output/ && find * -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
fff480734c99417c7a12dccb7c1029ea92059e88f1d56565e6d7f8fd572aeea9  aarch64-linux-gnu/bitcoin-29cc84727a2d-aarch64-linux-gnu-debug.tar.gz
0941375d26654aa6ece7884262f1f3e0e7619ddc9eb0c8bc72c21765eac61e90  aarch64-linux-gnu/bitcoin-29cc84727a2d-aarch64-linux-gnu.tar.gz
8f9a3119393d48a26bd108e1092badcc1c9513f8b8ca3f5e38ecb5e8b950d0a9  arm-linux-gnueabihf/bitcoin-29cc84727a2d-arm-linux-gnueabihf-debug.tar.gz
ba61eb82c54915231d6df49432d35ec120dcf995fec9f4e16e1e5c0b2798ffb3  arm-linux-gnueabihf/bitcoin-29cc84727a2d-arm-linux-gnueabihf.tar.gz
fca9809a5ef9510d09fad97aafa296985d51f3970e64269f5f7c8a98703c4008  dist-archive/bitcoin-29cc84727a2d.tar.gz
413ac3039bb6205994de8f597d6586aedee740b3ecd8a0c2c3d08200e7ceff76  powerpc64-linux-gnu/bitcoin-29cc84727a2d-powerpc64-linux-gnu-debug.tar.gz
4fa874b322c1810a6782378069de167cdca63bb090c359e4c7888e37582ce109  powerpc64-linux-gnu/bitcoin-29cc84727a2d-powerpc64-linux-gnu.tar.gz
53f8136072039c98e35f40ea0ba69774c1cbfc338427e1e6236a7040e2c1d167  powerpc64le-linux-gnu/bitcoin-29cc84727a2d-powerpc64le-linux-gnu-debug.tar.gz
adb6ab9a5ee1608d111473585ae31276ef83c461a39338cec43d373a405c269c  powerpc64le-linux-gnu/bitcoin-29cc84727a2d-powerpc64le-linux-gnu.tar.gz
6ff8221f394a77c823a1ebcff2f1ce38764fa394f7aba9313aac8a534153d0b5  riscv64-linux-gnu/bitcoin-29cc84727a2d-riscv64-linux-gnu-debug.tar.gz
c7fb59e3f2924a9a0a35c82fd4066d624b2c9c845221c33cfc2d14a0a1c75a04  riscv64-linux-gnu/bitcoin-29cc84727a2d-riscv64-linux-gnu.tar.gz
ddd6ec1456ae604da95bcd543e0777fdc601ae6497a866118a81ce3e207d954d  x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx-unsigned.dmg
3490cbe63681ae7aa1ed6d3bb7fdcdfcd374da1ffe846a76bda47fcbbe652aa9  x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx-unsigned.tar.gz
3686c7d3230ced9491331a22e7b25ea330b416240d322118dcbd41d53d1a7591  x86_64-apple-darwin18/bitcoin-29cc84727a2d-osx64.tar.gz
02a52b0697dc45da13349cde58d764bc48ac33a1c0d49aa3a0e4c5dc0689793c  x86_64-linux-gnu/bitcoin-29cc84727a2d-x86_64-linux-gnu-debug.tar.gz
745cc44d2b48d71b631ced31c10853aba0e606f060ca2e1d4e758bbbf0ce85cc  x86_64-linux-gnu/bitcoin-29cc84727a2d-x86_64-linux-gnu.tar.gz
8373e04218425c60bdacc6b18742fe30a55f87160884c75dbe3939bc6f3f46b5  x86_64-w64-mingw32/bitcoin-29cc84727a2d-win-unsigned.tar.gz
1b0e328bf0cbbcd2e4899e75dcaa9b533def97ee2ca7f66d8373403496242371  x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64-debug.zip
53cab715ba0b7b33b32aa4e5497e070ca03bc0edb7ed6ab589cb12a8a5909712  x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64-setup-unsigned.exe
9ab616decb8d41e6d21f9516b32cd4aba3af328f51553f3e37aac822da8e6bc0  x86_64-w64-mingw32/bitcoin-29cc84727a2d-win64.zip

By registering the container profiles as garbage collector roots, it
will prevent `guix gc` from garbage collecting derivations which our
container needs and inconvieniencing the user with a rebuild.
@dongcarl
Copy link
Contributor Author

dongcarl commented Apr 7, 2021

Pushed 29cc847 -> 867a5e1

  • Updated hint messages
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
d32d5e6d19698bddd259621e562ecac34d9bc956e647685a0ca612874d3b56ff  guix-build-867a5e172a23/output/aarch64-linux-gnu/bitcoin-867a5e172a23-aarch64-linux-gnu-debug.tar.gz
6fc407b36d07ea82015a68e0baeb5e01345dc6d9d3c233c03f4b3366f691c7aa  guix-build-867a5e172a23/output/aarch64-linux-gnu/bitcoin-867a5e172a23-aarch64-linux-gnu.tar.gz
f20531aa5da65b20120181f492a2cf98836f5807a384a7ffe9d80e7abd9f075a  guix-build-867a5e172a23/output/arm-linux-gnueabihf/bitcoin-867a5e172a23-arm-linux-gnueabihf-debug.tar.gz
9077801cf1b07966238392f14d68cc42e3c9c9f735529cf2036c7f5958175696  guix-build-867a5e172a23/output/arm-linux-gnueabihf/bitcoin-867a5e172a23-arm-linux-gnueabihf.tar.gz
e19d910eda5c0921d01d80d239e587fa9bd6276d9319b09bde19e7ce8b188b04  guix-build-867a5e172a23/output/dist-archive/bitcoin-867a5e172a23.tar.gz
2c5a100ca837c96c38e2c0c1d86a241b958be9a0f440541eb421813307c420bb  guix-build-867a5e172a23/output/powerpc64-linux-gnu/bitcoin-867a5e172a23-powerpc64-linux-gnu-debug.tar.gz
9a51188f5c1978d61102a526b050fc073c23e561cbdc3ab4dc9cae79abeec985  guix-build-867a5e172a23/output/powerpc64-linux-gnu/bitcoin-867a5e172a23-powerpc64-linux-gnu.tar.gz
9d87a9f1a36d6b5a47398472634f070027911cacaa9169740ecd2be3010f0ded  guix-build-867a5e172a23/output/powerpc64le-linux-gnu/bitcoin-867a5e172a23-powerpc64le-linux-gnu-debug.tar.gz
0740cc8b7ad0375309e48ca76013a33441ec6b96e50dc52372eadafe67c54b87  guix-build-867a5e172a23/output/powerpc64le-linux-gnu/bitcoin-867a5e172a23-powerpc64le-linux-gnu.tar.gz
25e7b8fe3eed33a3aaab6f000b8df5b84a08ad03a0a55318af435ff18e0129b6  guix-build-867a5e172a23/output/riscv64-linux-gnu/bitcoin-867a5e172a23-riscv64-linux-gnu-debug.tar.gz
696ef195af3a845e24a5ce1272b45c8c82010af8d5e1e68c89d598d55d844d7a  guix-build-867a5e172a23/output/riscv64-linux-gnu/bitcoin-867a5e172a23-riscv64-linux-gnu.tar.gz
1a3a71c96351edf30221c9c6291b4f7d994d2a2d869ac286740877ffad8f5074  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.dmg
e419ba2957b96f3de18a3205a91eb04270dbd8594d95c77d64497a53658f9863  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.tar.gz
1b86afd061a1f833fde3ef45e6e16d2fef50f406065233fd876929cf15d22cb5  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx64.tar.gz
47a18ae716e446dbb5e255f2b7830244252dbc1b0bfc92b68e6490aed1187b0b  guix-build-867a5e172a23/output/x86_64-linux-gnu/bitcoin-867a5e172a23-x86_64-linux-gnu-debug.tar.gz
a7a3df68f2e2746c16db518bb20775db67d6b0cfbc0798d912d7bb6672b3f115  guix-build-867a5e172a23/output/x86_64-linux-gnu/bitcoin-867a5e172a23-x86_64-linux-gnu.tar.gz
8f0c90354d36c2fc087f5ab71c27ab0da5426b1fe93d971a4bd727dcc0ddff4d  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win-unsigned.tar.gz
b3ae0fb4af6699db04ccdfa0d356ea1609b3cda117787e8c11d5eb774205cd54  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64-debug.zip
12eace890dcfc8058640eaee47f25b39631828b8f46ff1b40560bfc0f5406d16  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64-setup-unsigned.exe
e64b48c2788f8160145d0be8331c6b9fc7a26b3870ba29cf08536f51fbef4275  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64.zip

@fanquake
Copy link
Member

fanquake commented Apr 8, 2021

# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
d32d5e6d19698bddd259621e562ecac34d9bc956e647685a0ca612874d3b56ff  guix-build-867a5e172a23/output/aarch64-linux-gnu/bitcoin-867a5e172a23-aarch64-linux-gnu-debug.tar.gz
6fc407b36d07ea82015a68e0baeb5e01345dc6d9d3c233c03f4b3366f691c7aa  guix-build-867a5e172a23/output/aarch64-linux-gnu/bitcoin-867a5e172a23-aarch64-linux-gnu.tar.gz
f20531aa5da65b20120181f492a2cf98836f5807a384a7ffe9d80e7abd9f075a  guix-build-867a5e172a23/output/arm-linux-gnueabihf/bitcoin-867a5e172a23-arm-linux-gnueabihf-debug.tar.gz
9077801cf1b07966238392f14d68cc42e3c9c9f735529cf2036c7f5958175696  guix-build-867a5e172a23/output/arm-linux-gnueabihf/bitcoin-867a5e172a23-arm-linux-gnueabihf.tar.gz
e19d910eda5c0921d01d80d239e587fa9bd6276d9319b09bde19e7ce8b188b04  guix-build-867a5e172a23/output/dist-archive/bitcoin-867a5e172a23.tar.gz
2c5a100ca837c96c38e2c0c1d86a241b958be9a0f440541eb421813307c420bb  guix-build-867a5e172a23/output/powerpc64-linux-gnu/bitcoin-867a5e172a23-powerpc64-linux-gnu-debug.tar.gz
9a51188f5c1978d61102a526b050fc073c23e561cbdc3ab4dc9cae79abeec985  guix-build-867a5e172a23/output/powerpc64-linux-gnu/bitcoin-867a5e172a23-powerpc64-linux-gnu.tar.gz
9d87a9f1a36d6b5a47398472634f070027911cacaa9169740ecd2be3010f0ded  guix-build-867a5e172a23/output/powerpc64le-linux-gnu/bitcoin-867a5e172a23-powerpc64le-linux-gnu-debug.tar.gz
0740cc8b7ad0375309e48ca76013a33441ec6b96e50dc52372eadafe67c54b87  guix-build-867a5e172a23/output/powerpc64le-linux-gnu/bitcoin-867a5e172a23-powerpc64le-linux-gnu.tar.gz
25e7b8fe3eed33a3aaab6f000b8df5b84a08ad03a0a55318af435ff18e0129b6  guix-build-867a5e172a23/output/riscv64-linux-gnu/bitcoin-867a5e172a23-riscv64-linux-gnu-debug.tar.gz
696ef195af3a845e24a5ce1272b45c8c82010af8d5e1e68c89d598d55d844d7a  guix-build-867a5e172a23/output/riscv64-linux-gnu/bitcoin-867a5e172a23-riscv64-linux-gnu.tar.gz
1a3a71c96351edf30221c9c6291b4f7d994d2a2d869ac286740877ffad8f5074  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.dmg
e419ba2957b96f3de18a3205a91eb04270dbd8594d95c77d64497a53658f9863  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.tar.gz
1b86afd061a1f833fde3ef45e6e16d2fef50f406065233fd876929cf15d22cb5  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx64.tar.gz
47a18ae716e446dbb5e255f2b7830244252dbc1b0bfc92b68e6490aed1187b0b  guix-build-867a5e172a23/output/x86_64-linux-gnu/bitcoin-867a5e172a23-x86_64-linux-gnu-debug.tar.gz
a7a3df68f2e2746c16db518bb20775db67d6b0cfbc0798d912d7bb6672b3f115  guix-build-867a5e172a23/output/x86_64-linux-gnu/bitcoin-867a5e172a23-x86_64-linux-gnu.tar.gz
8f0c90354d36c2fc087f5ab71c27ab0da5426b1fe93d971a4bd727dcc0ddff4d  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win-unsigned.tar.gz
b3ae0fb4af6699db04ccdfa0d356ea1609b3cda117787e8c11d5eb774205cd54  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64-debug.zip
12eace890dcfc8058640eaee47f25b39631828b8f46ff1b40560bfc0f5406d16  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64-setup-unsigned.exe
e64b48c2788f8160145d0be8331c6b9fc7a26b3870ba29cf08536f51fbef4275  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64.zip

@fanquake
Copy link
Member

fanquake commented Apr 8, 2021

Ran the guix-clean script, and performed another build:

bash-5.1# git status
On branch 21304
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	guix-build-867a5e172a23/

nothing added to commit but untracked files present (use "git add" to track)
bash-5.1# contrib/guix/guix-clean 
Found precious_dirs file: '/bitcoin/guix-build-867a5e172a23/var/precious_dirs'
Avoiding OUTDIR_BASE: /guix-build-867a5e172a23/output
Avoiding PROFILES_BASE: /guix-build-867a5e172a23/var/profiles
Removing depends/aarch64-linux-gnu/
Removing depends/arm-apple-darwin20/
Removing depends/arm-linux-gnueabihf/
Removing depends/powerpc64-linux-gnu/
Removing depends/powerpc64le-linux-gnu/
Removing depends/riscv64-linux-gnu/
Removing depends/work/
Removing depends/x86_64-apple-darwin18/
Removing depends/x86_64-linux-gnu/
Removing depends/x86_64-w64-mingw32/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-aarch64-linux-gnu/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-arm-linux-gnueabihf/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-powerpc64-linux-gnu/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-powerpc64le-linux-gnu/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-riscv64-linux-gnu/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-x86_64-apple-darwin18/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-x86_64-linux-gnu/
Removing guix-build-867a5e172a23/distsrc-867a5e172a23-x86_64-w64-mingw32/
bash-5.1# time BASE_CACHE="/guix/base_cache" SOURCES_PATH="/guix/sources" SDK_PATH="/guix/SDKs" ./contrib/guix/guix-build
...
rm /outdir-base/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.temp.iso

real	83m45.435s
user	401m52.224s
sys	21m13.889s

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
d32d5e6d19698bddd259621e562ecac34d9bc956e647685a0ca612874d3b56ff  guix-build-867a5e172a23/output/aarch64-linux-gnu/bitcoin-867a5e172a23-aarch64-linux-gnu-debug.tar.gz
6fc407b36d07ea82015a68e0baeb5e01345dc6d9d3c233c03f4b3366f691c7aa  guix-build-867a5e172a23/output/aarch64-linux-gnu/bitcoin-867a5e172a23-aarch64-linux-gnu.tar.gz
f20531aa5da65b20120181f492a2cf98836f5807a384a7ffe9d80e7abd9f075a  guix-build-867a5e172a23/output/arm-linux-gnueabihf/bitcoin-867a5e172a23-arm-linux-gnueabihf-debug.tar.gz
9077801cf1b07966238392f14d68cc42e3c9c9f735529cf2036c7f5958175696  guix-build-867a5e172a23/output/arm-linux-gnueabihf/bitcoin-867a5e172a23-arm-linux-gnueabihf.tar.gz
e19d910eda5c0921d01d80d239e587fa9bd6276d9319b09bde19e7ce8b188b04  guix-build-867a5e172a23/output/dist-archive/bitcoin-867a5e172a23.tar.gz
2c5a100ca837c96c38e2c0c1d86a241b958be9a0f440541eb421813307c420bb  guix-build-867a5e172a23/output/powerpc64-linux-gnu/bitcoin-867a5e172a23-powerpc64-linux-gnu-debug.tar.gz
9a51188f5c1978d61102a526b050fc073c23e561cbdc3ab4dc9cae79abeec985  guix-build-867a5e172a23/output/powerpc64-linux-gnu/bitcoin-867a5e172a23-powerpc64-linux-gnu.tar.gz
9d87a9f1a36d6b5a47398472634f070027911cacaa9169740ecd2be3010f0ded  guix-build-867a5e172a23/output/powerpc64le-linux-gnu/bitcoin-867a5e172a23-powerpc64le-linux-gnu-debug.tar.gz
0740cc8b7ad0375309e48ca76013a33441ec6b96e50dc52372eadafe67c54b87  guix-build-867a5e172a23/output/powerpc64le-linux-gnu/bitcoin-867a5e172a23-powerpc64le-linux-gnu.tar.gz
25e7b8fe3eed33a3aaab6f000b8df5b84a08ad03a0a55318af435ff18e0129b6  guix-build-867a5e172a23/output/riscv64-linux-gnu/bitcoin-867a5e172a23-riscv64-linux-gnu-debug.tar.gz
696ef195af3a845e24a5ce1272b45c8c82010af8d5e1e68c89d598d55d844d7a  guix-build-867a5e172a23/output/riscv64-linux-gnu/bitcoin-867a5e172a23-riscv64-linux-gnu.tar.gz
1a3a71c96351edf30221c9c6291b4f7d994d2a2d869ac286740877ffad8f5074  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.dmg
e419ba2957b96f3de18a3205a91eb04270dbd8594d95c77d64497a53658f9863  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx-unsigned.tar.gz
1b86afd061a1f833fde3ef45e6e16d2fef50f406065233fd876929cf15d22cb5  guix-build-867a5e172a23/output/x86_64-apple-darwin18/bitcoin-867a5e172a23-osx64.tar.gz
47a18ae716e446dbb5e255f2b7830244252dbc1b0bfc92b68e6490aed1187b0b  guix-build-867a5e172a23/output/x86_64-linux-gnu/bitcoin-867a5e172a23-x86_64-linux-gnu-debug.tar.gz
a7a3df68f2e2746c16db518bb20775db67d6b0cfbc0798d912d7bb6672b3f115  guix-build-867a5e172a23/output/x86_64-linux-gnu/bitcoin-867a5e172a23-x86_64-linux-gnu.tar.gz
8f0c90354d36c2fc087f5ab71c27ab0da5426b1fe93d971a4bd727dcc0ddff4d  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win-unsigned.tar.gz
b3ae0fb4af6699db04ccdfa0d356ea1609b3cda117787e8c11d5eb774205cd54  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64-debug.zip
12eace890dcfc8058640eaee47f25b39631828b8f46ff1b40560bfc0f5406d16  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64-setup-unsigned.exe
e64b48c2788f8160145d0be8331c6b9fc7a26b3870ba29cf08536f51fbef4275  guix-build-867a5e172a23/output/x86_64-w64-mingw32/bitcoin-867a5e172a23-win64.zip

@laanwj
Copy link
Member

laanwj commented Apr 8, 2021

Converted to draft as the followup in #21375 re-does a lot of this changeset, will figure out how best to split up.

Is there anything left to do here or could it go out of draft status?

@dongcarl dongcarl marked this pull request as ready for review April 8, 2021 13:56
@dongcarl
Copy link
Contributor Author

dongcarl commented Apr 8, 2021

Is there anything left to do here or could it go out of draft status?

Ah 🤦 my bad I forgot to take it out of draft :-)
I don't think there's anything left to do

@laanwj
Copy link
Member

laanwj commented Apr 8, 2021

ACK 867a5e1
My build output exactly matches @dongcarl 's and @fanquake's

@laanwj laanwj merged commit 0c9597c into bitcoin:master Apr 8, 2021
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 18, 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.

None yet

7 participants