[no subject]

[Ludovic Courtès]

branch: master
commit 211b44c3c452a16b6ecd070bb3237d9cea971bf9
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue May 30 23:24:00 2023 +0200

    Remove unused '%use-substitutes?' parameter and '--use-substitutes'.
    
    '%use-substitutes?' had an effect when it was introduced in
    fca42b010e56532fded536534ccb15b078a33e77 but it got lost eventually.
    
    * src/cuirass/base.scm (%use-substitutes?): Remove.
    * src/cuirass/scripts/register.scm (show-help): Remove
    '--use-substitutes'.
    (cuirass-register): Remove dead store to '%use-substitutes?'.
    * doc/cuirass.texi (Invocation): Remove '--use-substitutes'.
---
 doc/cuirass.texi                 | 6 +-----
 src/cuirass/base.scm             | 5 -----
 src/cuirass/scripts/register.scm | 6 ++----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/doc/cuirass.texi b/doc/cuirass.texi
index db46a33..5d8162e 100644
--- a/doc/cuirass.texi
+++ b/doc/cuirass.texi
@@ -11,7 +11,7 @@ server.
 @copying
 Copyright @copyright{} 2016, 2017 Mathieu Lirzin@*
 Copyright @copyright{} 2017, 2020, 2021 Mathieu Othacehe@*
-Copyright @copyright{} 2018, 2021 Ludovic Courtès@*
+Copyright @copyright{} 2018, 2021, 2023 Ludovic Courtès@*
 Copyright @copyright{} 2018 Clément Lassieur
 
 @quotation
@@ -536,10 +536,6 @@ user under which Cuirass is running.
 @itemx -I @var{n}
 Wait @var{n} seconds between each poll.
 
-@item --use-substitutes
-This can be useful when you are not interested in building the
-dependencies of a particular job.
-
 @item --threads=@var{n}
 Use up to @var{n} kernel threads.
 
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 57dd8a9..ed768c6 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -83,17 +83,12 @@
             %gc-root-directory
             %gc-root-ttl
             %build-remote?
-            %use-substitutes?
             %fallback?))
 
 (define %build-remote?
   ;; Define whether to use the remote build mechanism.
   (make-parameter #f))
 
-(define %use-substitutes?
-  ;; Define whether to use substitutes
-  (make-parameter #f))
-
 (define %fallback?
   ;; Define whether to fall back to building when the substituter fails.
   (make-parameter #f))
diff --git a/src/cuirass/scripts/register.scm b/src/cuirass/scripts/register.scm
index 0b0c124..39138c5 100644
--- a/src/cuirass/scripts/register.scm
+++ b/src/cuirass/scripts/register.scm
@@ -1,7 +1,7 @@
 ;;;; cuirass -- continuous integration tool
 ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <othacehe@gnu.org>
-;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
 ;;;
 ;;; This file is part of Cuirass.
@@ -55,7 +55,6 @@
       --ttl=DURATION        Keep build results live for at least DURATION.
   -I, --interval=N          Wait N seconds between each poll
       --build-remote        Use the remote build mechanism
-      --use-substitutes     Allow usage of pre-built substitutes
       --threads=N           Use up to N kernel threads
   -V, --version             Display version
   -h, --help                Display this help message")
@@ -70,7 +69,7 @@
     (database       (single-char #\D) (value #t))
     (interval       (single-char #\I) (value #t))
     (build-remote                     (value #f))
-    (use-substitutes                  (value #f))
+    (use-substitutes                  (value #f)) ;unused, for back compat
     (threads                          (value #t))
     (fallback                         (value #f))
     (ttl                              (value #t))
@@ -90,7 +89,6 @@
          (%package-cachedir
           (option-ref opts 'cache-directory (%package-cachedir)))
          (%build-remote? (option-ref opts 'build-remote #f))
-         (%use-substitutes? (option-ref opts 'use-substitutes #f))
          (%fallback? (option-ref opts 'fallback #f))
          (%gc-root-ttl
           (time-second (string->duration (option-ref opts 'ttl "30d")))))