diff options
| author | Arun Isaac | 2026-06-01 04:08:28 +0100 |
|---|---|---|
| committer | Arun Isaac | 2026-06-01 13:33:07 +0100 |
| commit | ff33a2731e421f0719ca8e2eb8134c5f549606b6 (patch) | |
| tree | 65a833f28e5aaeb5faf061f2b92c3464d733f652 /guix/forge | |
| parent | 2eca0f92e6ad002be21bbdbcff3d006a17197f33 (diff) | |
| download | guix-forge-ff33a2731e421f0719ca8e2eb8134c5f549606b6.tar.gz guix-forge-ff33a2731e421f0719ca8e2eb8134c5f549606b6.tar.lz guix-forge-ff33a2731e421f0719ca8e2eb8134c5f549606b6.zip | |
The upstream guix package now uses guile-3.0-latest. Most CI jobs use the guix package, and if we run them with the older guile-3.0 package, we get "incompatible bytecode version" warnings. So, switch to guile-3.0-latest. However, the real solution is probably to let CI jobs specify the version of guile they want. This would be straightforward if we accepted program-file objects instead of G-expressions as CI jobs.
Diffstat (limited to 'guix/forge')
| -rw-r--r-- | guix/forge/laminar.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/guix/forge/laminar.scm b/guix/forge/laminar.scm index dcbc5bf..74789be 100644 --- a/guix/forge/laminar.scm +++ b/guix/forge/laminar.scm @@ -1,5 +1,5 @@ ;;; guix-forge --- Guix software forge meta-service -;;; Copyright © 2021–2022, 2024–2025 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2021–2022, 2024–2026 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of guix-forge. ;;; @@ -21,6 +21,7 @@ #:use-module (gnu) #:use-module (srfi srfi-1) #:use-module (gnu packages ci) + #:use-module ((gnu packages guile) #:select (guile-3.0-latest)) #:use-module (gnu services ci) #:use-module (guix records) #:use-module (ice-9 match) @@ -119,11 +120,14 @@ of @var{<forge-laminar-job>} objects." (let ((name (forge-laminar-job-name job))) `(,(let ((run-name (string-append name ".run"))) `(,run-name ,(program-file run-name - (forge-laminar-job-run job)))) + (forge-laminar-job-run job) + #:guile guile-3.0-latest))) ,@(let ((after (forge-laminar-job-after job)) (after-name (string-append name ".after"))) (if after - `((,after-name ,(program-file after-name after))) + `((,after-name ,(program-file after-name + after + #:guile guile-3.0-latest))) '())) ,@(match (forge-laminar-job-contexts job) (() '()) |