From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 43893@debbugs.gnu.org
Subject: bug#43893: [PATCH v3] maint: update-guix-package: Prevent accidentally breaking guix pull.
Date: Fri, 23 Oct 2020 00:38:32 -0400 [thread overview]
Message-ID: <87eelpd0af.fsf@gmail.com> (raw)
In-Reply-To: <875z749czt.fsf@gnu.org> ("Ludovic Courtès"'s message of "Wed, 21 Oct 2020 10:53:10 +0200")
Hi Ludovic,
Ludovic Courtès <ludo@gnu.org> writes:
> Hi,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>
[...]
>> Sorry, I'm a bit lost. Are you suggesting that we should restore the
>> code following the ;; Re-add SOURCE [...], but wrapped with unless to
>> make it conditional to GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT being
>> defined? That part depends on SOURCE, a store file name, which we don't
>> have anymore since we no longer add the sources to the store to compute
>> the hash.
>
> I’m saying that the solution to the initial problem (that if you don’t
> run ‘guix build guix -S --check’ you’re not sure ‘guix’ is referring to
> a valid upstream commit)
The original problem was about the updated Guix package containing a
faulty hash (due to being computed from a uncontrolled checkout that
could be dirty). The other concern about preventing the use of a not
yet published commit was added based on earlier feedback.
> above. The trick at “Re-add SOURCE” is here precisely to prevent
> attempts to re-download, as the comment explains, and this is what has
> been causing these troubles.
>
> The advantages (to me) would have been simpler code, no shelling out to
> ‘git’, and no fiddling with files under $PWD.
Less code would also mean poorer diagnostics:
time ./pre-inst-env guix build guix -S
The following derivation will be built:
/gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-checkout.drv
building /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-checkout.drv...
guile: warning: failed to install locale
environment variable `PATH' set to `/gnu/store/378zjf2kgajcfd7mfr98jn5xyc5wa3qv-gzip-1.10/bin:/gnu/store/sf3rbvb6iqcphgm1afbplcs72hsywg25-tar-1.32/bin'
Initialized empty Git repository in /gnu/store/02da8jb3wzzi3bqvrl214gdg0kkxmaf8-guix-1.1.0-31.07c13ae-checkout/.git/
error: Server does not allow request for unadvertised object 07c13aeb5abb1a5bc3cabffb9b2212993a0d5a0e
Failed to do a shallow fetch; retrying a full fetch...
From https://git.savannah.gnu.org/git/guix
* [new branch] core-updates -> origin/core-updates
[...]
* [new tag] v1.1.0rc2 -> v1.1.0rc2
fatal: reference is not a tree: 07c13aeb5abb1a5bc3cabffb9b2212993a0d5a0e
git-fetch: '/gnu/store/i5b1vv7qc6l2gi4xwa9mqzjy3shvgk30-git-minimal-2.28.0/bin/git checkout 07c13aeb5abb1a5bc3cabffb9b2212993a0d5a0e' failed with exit code 128
Trying content-addressed mirror at berlin.guix.gnu.org...
Trying content-addressed mirror at berlin.guix.gnu.org...
Trying to download from Software Heritage...
builder for `/gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-checkout.drv' failed to produce output path `/gnu/store/02da8jb3wzzi3bqvrl214gdg0kkxmaf8-guix-1.1.0-31.07c13ae-checkout'
build of /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-checkout.drv failed
View build log at '/var/log/guix/drvs/zh/fchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-checkout.drv.bz2'.
guix build: error: build of `/gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-checkout.drv' failed
real 1m42.825s
user 0m2.191s
sys 0m0.189s
This took nearly 2 minutes, fetching the full Guix git repo just to tell
me that *something* is not right.
Currently, we have:
time make update-guix-package
git rev-parse HEAD
4893a1394e2eb8b97995b491f2f37ed85513a20f
./pre-inst-env "/gnu/store/i7z4pfa0c22q0qkxyl7fy2nlp3w658yg-profile/bin/guile" \
./build-aux/update-guix-package.scm \
"`git rev-parse HEAD`"
error: Commit 4893a1394e2eb8b97995b491f2f37ed85513a20f is not pushed upstream. Aborting.
make: *** [Makefile:6507: update-guix-package] Error 1
real 0m1.135s
user 0m1.066s
sys 0m0.199s
> BTW, in ‘make release’ does ‘make update-guix-package’ and expects it to
> work with a not-pushed-yet commit. So it’s a case where we need
> GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes.
Ah, good point. I'd like to fix this, but running 'make release', it
fails on:
make[3]: *** No rule to make target 'po/doc/guix-manual.pot', needed by
'distdir-am'. Stop.
What did I miss?
Thank you!
Maxim
next prev parent reply other threads:[~2020-10-23 4:39 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 21:58 bug#43893: make update-guix-package produced an incorrect hash Maxim Cournoyer
2020-10-10 0:04 ` Danny Milosavljevic
2020-10-10 5:08 ` Maxim Cournoyer
2020-10-10 5:08 ` bug#43893: [PATCH] maint: update-guix-package: Ensure sources are clean Maxim Cournoyer
2020-10-10 11:59 ` Danny Milosavljevic
2020-10-11 2:35 ` Maxim Cournoyer
2020-10-10 20:08 ` Ludovic Courtès
2020-10-10 21:14 ` Danny Milosavljevic
2020-10-12 4:40 ` Maxim Cournoyer
2020-10-12 9:40 ` Ludovic Courtès
2020-10-12 14:18 ` Danny Milosavljevic
2020-10-11 19:43 ` Maxim Cournoyer
2020-10-12 9:43 ` Ludovic Courtès
2020-10-13 1:33 ` Maxim Cournoyer
2020-10-11 19:57 ` bug#43893: [PATCH v2] maint: update-guix-package: Prevent accidentally breaking guix pull Maxim Cournoyer
2020-10-13 16:00 ` Marius Bakke
2020-10-14 3:17 ` bug#43893: [PATCH v3] " Maxim Cournoyer
2020-10-20 21:06 ` Ludovic Courtès
2020-10-21 2:36 ` Maxim Cournoyer
2020-10-21 8:53 ` Ludovic Courtès
2020-10-23 4:38 ` Maxim Cournoyer [this message]
2020-10-23 15:01 ` Ludovic Courtès
2020-10-25 4:32 ` Maxim Cournoyer
2020-10-25 14:50 ` Ludovic Courtès
2020-10-25 15:29 ` Ludovic Courtès
2020-10-31 3:56 ` Maxim Cournoyer
2020-10-31 10:42 ` Ludovic Courtès
2020-11-09 19:28 ` Maxim Cournoyer
2020-11-09 22:03 ` Ludovic Courtès
2020-11-10 14:31 ` Maxim Cournoyer
2020-11-09 19:29 ` bug#43893: [PATCH] maint: update-guix-package: Optionally add sources to store Maxim Cournoyer
2020-11-09 22:18 ` Ludovic Courtès
2020-11-10 14:02 ` Maxim Cournoyer
2020-11-10 14:48 ` Ludovic Courtès
2020-11-10 15:18 ` Maxim Cournoyer
2020-11-09 22:44 ` bug#43893: [PATCH v5] " Maxim Cournoyer
2020-11-10 9:32 ` Ludovic Courtès
2020-10-25 14:41 ` bug#43893: [PATCH v3] maint: update-guix-package: Prevent accidentally breaking guix pull Ludovic Courtès
2020-10-25 19:17 ` Maxim Cournoyer
2020-10-14 4:10 ` bug#43893: [PATCH v2] " Maxim Cournoyer
2020-10-19 18:04 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eelpd0af.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=43893@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).