diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-01-26 10:58:20 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-02-20 22:34:55 +0100 |
| commit | dc29e365099be977a87f31da4ccc57ad7500c64d (patch) | |
| tree | f36d442f81d82f49acdbcf36cf34515dfe5a7b6e /gnu | |
| parent | 10a2533d364400de6d0a2b7ff59c6f6632001166 (diff) | |
ci: Add provenance information for ‘guix’ jobs.
This changes ‘guix’ jobs to include provenance metadata, thereby addressing
<https://codeberg.org/guix/maintenance/pulls/68#issuecomment-9184019>. It
also avoids relying on the low-level channel implementation details.
* gnu/ci.scm (guix-jobs)[build]: Remove.
[instance]: New variable.
Pass it to ‘channel-instances->derivation’ instead of calling ‘build’.
Reported-by: Rutherther <rutherther@ditigal.xyz>
Change-Id: I4b63a12374b0717b8a62786486bc2e7915f6439b
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/ci.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index c4ce87a7c73..80f226a5fb4 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2017, 2020, 2026 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2012-2024, 2026 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2020, 2026 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020, 2021 Mathieu Othacehe <othacehe@gnu.org> @@ -232,17 +232,18 @@ SYSTEM." (define* (guix-jobs store systems #:key source commit) "Return a list of jobs for Guix itself." - (define build - (primitive-load (string-append source "/build-aux/build-self.scm"))) + (define instance + (checkout->channel-instance source + #:url (channel-url %default-guix-channel) + #:commit commit)) (map (lambda (system) (let ((name (string->symbol (string-append "guix." system))) (drv (run-with-store store - (build source #:version commit #:system system - #:pull-version 1 - #:guile-version "2.2")))) + (channel-instances->derivation (list instance) + #:system system)))) (derivation->job name drv))) systems)) |