From ff52d1156c249ce8906972941a92e1816f86e395 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 08:41:10 +0100 Subject: gnu: cuirass: Update to 0.0.1-73.14e1335. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-73.14e1335. [arguments]: Enable tests and add new 'set-PATH-for-tests phase. [native-inputs]: Add ephemeralpg. --- gnu/packages/ci.scm | 68 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 29 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5fa800be4a..bf1346f628 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,20 +66,21 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "543e26addc6e2304611e2feb8dd3a5a0646507b6") - (revision "72")) + (let ((commit "14e1335732271fdce730cb7e5043429ea9155201") + (revision "73")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01cxg0nwafzfg0phbv1b4cv24w7yaalkkdib3qfwf6jqagbfg85y")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xv2c4x1zbsf7ifwkmf1fjbbgbbdv33d8qx6b6iw9nnfr2022fqa")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -87,9 +88,14 @@ (ice-9 rdelim) (ice-9 popen)) #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass - #:tests? #f ;requires a PostgreSQL database. #:phases (modify-phases %standard-phases + (add-before 'check 'set-PATH-for-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((pg (assoc-ref inputs "ephemeralpg")) + (path (getenv "PATH"))) + (setenv "PATH" (string-append pg "/bin:" path)) + #t))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. @@ -110,22 +116,25 @@ (deps (list avahi gcrypt json zmq squee git bytes fibers zlib matd tls mail guix)) (guile (assoc-ref %build-inputs "guile")) - (effective (read-line - (open-pipe* OPEN_READ - (string-append guile "/bin/guile") - "-c" "(display (effective-version))"))) - (mods (string-drop-right ;drop trailing colon - (string-join deps - (string-append "/share/guile/site/" - effective ":") - 'suffix) - 1)) - (objs (string-drop-right - (string-join deps - (string-append "/lib/guile/" effective - "/site-ccache:") - 'suffix) - 1))) + (effective + (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (mods + (string-drop-right ;drop trailing colon + (string-join deps + (string-append "/share/guile/site/" + effective ":") + 'suffix) + 1)) + (objs + (string-drop-right + (string-join deps + (string-append "/lib/guile/" effective + "/site-ccache:") + 'suffix) + 1))) ;; Make sure 'cuirass' can find the 'evaluate' command, as ;; well as the relevant Guile modules. (for-each @@ -157,7 +166,8 @@ `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("ephemeralpg" ,ephemeralpg))) (native-search-paths ;; For HTTPS access, Cuirass itself honors these variables, with the ;; same semantics as Git and OpenSSL (respectively). -- cgit v1.2.3 From f8953bea858f894b406eed4a0aca0cd4c4d8671d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 13:59:44 +0100 Subject: gnu: cuirass: Update to 0.0.1-74.c8051f3. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-74.c8051f3. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index bf1346f628..e9d975d8e5 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "14e1335732271fdce730cb7e5043429ea9155201") - (revision "73")) + (let ((commit "c8051f3b6861f21b250bbf92acf7fa5ac0d5dfaa") + (revision "74")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1xv2c4x1zbsf7ifwkmf1fjbbgbbdv33d8qx6b6iw9nnfr2022fqa")))) + "07z3859vfmxmpknlch7wd1ivnpvcxm6dsll4nh3dgygibxw9pspx")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From c260aff63e9590f9930ff937e4960da7b0c9696c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 16:01:36 +0100 Subject: gnu: cuirass: Update to 0.0.1-75.94a7f87. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-75.94a7f87. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e9d975d8e5..25e0fe73bd 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "c8051f3b6861f21b250bbf92acf7fa5ac0d5dfaa") - (revision "74")) + (let ((commit "94a7f870a7d813326e6ac6539d243a2994eca918") + (revision "75")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "07z3859vfmxmpknlch7wd1ivnpvcxm6dsll4nh3dgygibxw9pspx")))) + "1i4mlsdlx72y829qh0cavzb9klbnxyl9kah64b473vbnl20whyny")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From c1baf9b8247f4f691b9f78fdc65ac5a1bc28f629 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 16:41:05 +0100 Subject: gnu: cuirass: Update to 0.0.1-76.5f830da. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-76.5f830da. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 25e0fe73bd..6f874165d9 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "94a7f870a7d813326e6ac6539d243a2994eca918") - (revision "75")) + (let ((commit "5f830da3e3fde58044f189a0dfc30fe6aa0d8db6") + (revision "76")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1i4mlsdlx72y829qh0cavzb9klbnxyl9kah64b473vbnl20whyny")))) + "1wkrpxpf52pf37k1v1rnlscmnj64qvpqv3rgx46x4iah0jf57yyc")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 60174c9c8c307be43450af38ce7c4e268278e07c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 19:26:14 +0100 Subject: gnu: cuirass: Update to 0.0.1-77.88f3cf6. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-77.88f3cf6. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 6f874165d9..8b1bb2986f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "5f830da3e3fde58044f189a0dfc30fe6aa0d8db6") - (revision "76")) + (let ((commit "88f3cf65e0b5974c6525d498ebffc607bc62baf0") + (revision "77")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1wkrpxpf52pf37k1v1rnlscmnj64qvpqv3rgx46x4iah0jf57yyc")))) + "1mwi6i400kjdkfccvbc49fka18dhkcl0rbiqylgpb7lh0pzss9j7")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From d1e1682749b2ad863a78ec3b1e1e840b1dbf5149 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 11:45:54 +0100 Subject: gnu: cuirass: Update to 1.0.0-1.0497e0d. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-1.0497e0d. --- gnu/packages/ci.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 8b1bb2986f..4fa85d0893 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,11 +66,11 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "88f3cf65e0b5974c6525d498ebffc607bc62baf0") - (revision "77")) + (let ((commit "0497e0d6c4184223034855b61312d38ffae0b766") + (revision "1")) (package (name "cuirass") - (version (git-version "0.0.1" revision commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1mwi6i400kjdkfccvbc49fka18dhkcl0rbiqylgpb7lh0pzss9j7")))) + "1y6030kx6c8h927gr30b78b3flwlqx15iakrc2lgw5xw0367gqhg")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -88,6 +88,7 @@ (ice-9 rdelim) (ice-9 popen)) #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass + #:parallel-tests? #f #:phases (modify-phases %standard-phases (add-before 'check 'set-PATH-for-tests @@ -96,6 +97,12 @@ (path (getenv "PATH"))) (setenv "PATH" (string-append pg "/bin:" path)) #t))) + ;; Disable the remote tests that require a Guix daemon connection. + (add-before 'check 'disable-remote-tests + (lambda _ + (substitute* "Makefile.am" + (("tests/remote.scm") "")) + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. @@ -135,15 +142,11 @@ "/site-ccache:") 'suffix) 1))) - ;; Make sure 'cuirass' can find the 'evaluate' command, as - ;; well as the relevant Guile modules. - (for-each - (lambda (name) - (wrap-program (string-append out "/bin/" name) - `("PATH" ":" prefix (,(string-append out "/bin"))) - `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))) - '("cuirass" "remote-server" "remote-worker")) + ;; Make sure 'cuirass' can find the relevant Guile modules. + (wrap-program (string-append out "/bin/cuirass") + `("PATH" ":" prefix (,(string-append out "/bin"))) + `("GUILE_LOAD_PATH" ":" prefix (,mods)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs `(("guile" ,guile-3.0/libgc-7) -- cgit v1.2.3 From 0efd68681dcec50d445a4fd080c315b999164828 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 12:01:23 +0100 Subject: gnu: cuirass: Update to 1.0.0-2.6f4a203. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-2.6f4a203. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4fa85d0893..e0c7238f2b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "0497e0d6c4184223034855b61312d38ffae0b766") - (revision "1")) + (let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7") + (revision "2")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1y6030kx6c8h927gr30b78b3flwlqx15iakrc2lgw5xw0367gqhg")))) + "120cnnjy4j2dinfmas1ddmqzzc7ikj9c76sl4li6g6dn8g7s8f69")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3