[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/11: ci: Adjust 'channel-build-system' for when the source is a file n
From: |
guix-commits |
Subject: |
11/11: ci: Adjust 'channel-build-system' for when the source is a file name. |
Date: |
Thu, 5 Mar 2020 17:42:28 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit bc8b2ffdac3f55414629ace5b1a0db32e9656c0a
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Mar 5 23:36:01 2020 +0100
ci: Adjust 'channel-build-system' for when the source is a file name.
Fixes an evaluation error introduced in
dd1ee160be8ba4e211432c08e161c24901cd670e: when invoked via
'build-aux/cuirass/gnu-system.scm', SOURCE is a store file name, not a
<local-file> as it is when invoked via 'etc/system-tests.scm'.
* gnu/ci.scm (channel-build-system)[build]: Call 'lower-object' only
when SOURCE is not a string.
---
gnu/ci.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 9dc530b..e024c09 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -243,7 +243,11 @@ system.")
#:key source commit system
#:allow-other-keys)
(run-with-store store
- (mlet* %store-monad ((source (lower-object source))
+ ;; SOURCE can be a lowerable object such as <local-file>
+ ;; or a file name. Adjust accordingly.
+ (mlet* %store-monad ((source (if (string? source)
+ (return source)
+ (lower-object source)))
(instance
-> (checkout->channel-instance
source #:commit commit)))
- branch master updated (2c2b1ef -> bc8b2ff), guix-commits, 2020/03/05
- 02/11: installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'., guix-commits, 2020/03/05
- 06/11: installer: Honor /tmp/installer-system-init-options., guix-commits, 2020/03/05
- 04/11: installer: Bypass connectivity check when /tmp/installer-assume-online exists., guix-commits, 2020/03/05
- 01/11: tests: 'run-basic-test' can enter a root password., guix-commits, 2020/03/05
- 05/11: installer: Run commands without hopping through the shell., guix-commits, 2020/03/05
- 08/11: installer: Fix cow-store umount., guix-commits, 2020/03/05
- 09/11: tests: install: Add %test-gui-installed-os-encrypted., guix-commits, 2020/03/05
- 11/11: ci: Adjust 'channel-build-system' for when the source is a file name.,
guix-commits <=
- 07/11: tests: install: Add "gui-installed-os"., guix-commits, 2020/03/05
- 03/11: installer: Implement a dialog on /var/guix/installer-socket., guix-commits, 2020/03/05
- 10/11: hydra: Remove uses of _IOLBF., guix-commits, 2020/03/05