* [bug#57515] [PATCH 0/8] Stop unmirroring during updates.
@ 2022-09-01 9:00 Maxime Devos
2022-09-01 9:05 ` Maxime Devos
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Maxime Devos @ 2022-09-01 9:00 UTC (permalink / raw)
To: 57515; +Cc: Maxime Devos
This patch series fixes #57477
(‘"guix refresh -u" sometimes 'unmirrors' source URLs’)
(at least, for the cases that I tested). The individual commits
have proposals for what packages to test things on.
Due to the new behaviour of 'latest-html-release', a few
simplifications were possible in other updaters. However,
to keep 57477 fixed, some URLs in (guix download) had to be
switched from http to https.
I'm currently running "make check", not yet completed.
Maxime Devos (8):
guix: Extract logic of the check-mirror-url.
gnu-maintenance: Produce mirror:// URIs in latest-ftp-release.
gnu-maintenance: Produce mirror:// URIs in latest-html-release.
download: Switch savannah mirrors to HTTPS URLs.
gnu-maintenance: Simplify latest-savannah-release.
download: Add a kernel.org mirror.
gnu-maintenance: Simplify latest-kernel.org-release.
gnu-maintenance: Remove unused procedures.
guix/download.scm | 17 ++++-----
guix/gnu-maintenance.scm | 74 ++++++++++++++++++++++------------------
guix/lint.scm | 23 ++++---------
3 files changed, 56 insertions(+), 58 deletions(-)
base-commit: 57f8f69562e942557e3331bb81c7e4acd973d189
--
2.37.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#57515] [PATCH 0/8] Stop unmirroring during updates.
2022-09-01 9:00 [bug#57515] [PATCH 0/8] Stop unmirroring during updates Maxime Devos
@ 2022-09-01 9:05 ` Maxime Devos
2022-09-01 10:13 ` Maxime Devos
2022-09-01 9:27 ` Maxime Devos
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Maxime Devos @ 2022-09-01 9:05 UTC (permalink / raw)
To: 57515
[-- Attachment #1.1.1.1: Type: text/plain, Size: 81 bytes --]
> TODO: test case, it's http!
Oops I forgot this TODO, I'll try writing one.
[-- Attachment #1.1.1.2: Type: text/html, Size: 323 bytes --]
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#57515] [PATCH 0/8] Stop unmirroring during updates.
2022-09-01 9:00 [bug#57515] [PATCH 0/8] Stop unmirroring during updates Maxime Devos
2022-09-01 9:05 ` Maxime Devos
@ 2022-09-01 9:27 ` Maxime Devos
2022-09-01 9:43 ` [bug#57515] [PATCH 9/9] tests/gnu-maintenance: Test latest-html-release Maxime Devos
2022-09-26 20:35 ` bug#57515: [PATCH 0/8] Stop unmirroring during updates Ludovic Courtès
3 siblings, 0 replies; 6+ messages in thread
From: Maxime Devos @ 2022-09-01 9:27 UTC (permalink / raw)
To: 57515
[-- Attachment #1.1.1: Type: text/plain, Size: 900 bytes --]
On 01-09-2022 11:00, Maxime Devos wrote:
> This patch series fixes #57477
> (‘"guix refresh -u" sometimes 'unmirrors' source URLs’)
> (at least, for the cases that I tested). The individual commits
> have proposals for what packages to test things on.
>
> Due to the new behaviour of 'latest-html-release', a few
> simplifications were possible in other updaters. However,
> to keep 57477 fixed, some URLs in (guix download) had to be
> switched from http to https.
>
> I'm currently running "make check", not yet completed.
A guix-system test fails:
Authenticating channel 'guix', commits 9edb3f6 to a6a1b17 (40.004 new
commits)...
^[[K[ ]guix system: error: could not authenticate commit
a6a1b17f29411c44cdda8d0cdf24acd472645140: key C1F3 3EE2 0C52 8FDB 7DD7
011F 49E3 EE22 1917 25
but this appears unrelated (though TBI I suppose).
Greetings,
Maxime.
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#57515] [PATCH 9/9] tests/gnu-maintenance: Test latest-html-release.
2022-09-01 9:00 [bug#57515] [PATCH 0/8] Stop unmirroring during updates Maxime Devos
2022-09-01 9:05 ` Maxime Devos
2022-09-01 9:27 ` Maxime Devos
@ 2022-09-01 9:43 ` Maxime Devos
2022-09-26 20:35 ` bug#57515: [PATCH 0/8] Stop unmirroring during updates Ludovic Courtès
3 siblings, 0 replies; 6+ messages in thread
From: Maxime Devos @ 2022-09-01 9:43 UTC (permalink / raw)
To: 57515; +Cc: Maxime Devos
* tests/gnu-maintenance.scm
("latest-html-release, no signature")
("latest-html-release, signature): Two new tests.
---
tests/gnu-maintenance.scm | 70 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm
index c04d8ba733..a9e2a0bb9f 100644
--- a/tests/gnu-maintenance.scm
+++ b/tests/gnu-maintenance.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,9 +19,14 @@
(define-module (test-gnu-maintenance)
#:use-module (guix gnu-maintenance)
+ #:use-module (guix tests)
+ #:use-module (guix tests http)
+ #:use-module (guix upstream)
+ #:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-64)
- #:use-module (ice-9 match))
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 textual-ports))
(test-begin "gnu-maintenance")
@@ -55,4 +61,66 @@ (define-module (test-gnu-maintenance)
("mpg321_0.3.2.orig.tar.gz" "0.3.2")
("bvi-1.4.1.src.tar.gz" "1.4.1")))))
+(test-assert "latest-html-release, no signature"
+ (with-http-server
+ `((200 "<html xmlns=\"http://www.w3.org/1999/xhtml\">
+<head>
+<title>Releases!</title>
+</head>
+<body>
+<a href=\"bar/foo-1.tar.gz\">version 1</a>
+<a href=\"bar/foo-2.tar.gz\">version 2</a>
+</body>
+</html>"))
+ (let ()
+ (define package
+ (dummy-package "foo"
+ (source
+ (dummy-origin
+ (uri (string-append (%local-url) "/foo-1.tar.gz"))))
+ (properties
+ `((release-monitoring-url . ,(%local-url))))))
+ (define update ((upstream-updater-latest %generic-html-updater) package))
+ (define expected-new-url
+ (string-append (%local-url) "/foo-2.tar.gz"))
+ (and (pk 'u update)
+ (equal? (upstream-source-version update) "2")
+ (equal? (list expected-new-url)
+ (upstream-source-urls update))
+ (null? ;; both #false and the empty list are acceptable
+ (or (upstream-source-signature-urls update) '()))))))
+
+(test-assert "latest-html-release, signature"
+ (with-http-server
+ `((200 "<html xmlns=\"http://www.w3.org/1999/xhtml\">
+<head>
+<title>Signed releases!</title>
+</head>
+<body>
+<a href=\"bar/foo-1.tar.gz\">version 1</a>
+<a href=\"bar/foo-2.tar.gz\">version 2</a>
+<a href=\"bar/foo-1.tar.gz.sig\">version 1 signature</a>
+<a href=\"bar/foo-2.tar.gz.sig\">version 2 signature</a>
+</body>
+</html>"))
+ (let ()
+ (define package
+ (dummy-package "foo"
+ (source
+ (dummy-origin
+ (uri (string-append (%local-url) "/foo-1.tar.gz"))))
+ (properties
+ `((release-monitoring-url . ,(%local-url))))))
+ (define update ((upstream-updater-latest %generic-html-updater) package))
+ (define expected-new-url
+ (string-append (%local-url) "/foo-2.tar.gz"))
+ (define expected-signature-url
+ (string-append (%local-url) "/foo-2.tar.gz.sig"))
+ (and (pk 'u update)
+ (equal? (upstream-source-version update) "2")
+ (equal? (list expected-new-url)
+ (upstream-source-urls update))
+ (equal? (list expected-signature-url)
+ (upstream-source-signature-urls update))))))
+
(test-end)
--
2.37.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#57515] [PATCH 0/8] Stop unmirroring during updates.
2022-09-01 9:05 ` Maxime Devos
@ 2022-09-01 10:13 ` Maxime Devos
0 siblings, 0 replies; 6+ messages in thread
From: Maxime Devos @ 2022-09-01 10:13 UTC (permalink / raw)
To: 57515
[-- Attachment #1.1.1.1: Type: text/plain, Size: 152 bytes --]
On 01-09-2022 11:05, Maxime Devos wrote:
>
>> TODO: test case, it's http!
> Oops I forgot this TODO, I'll try writing one.
Done in the 9th patch
[-- Attachment #1.1.1.2: Type: text/html, Size: 662 bytes --]
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#57515: [PATCH 0/8] Stop unmirroring during updates.
2022-09-01 9:00 [bug#57515] [PATCH 0/8] Stop unmirroring during updates Maxime Devos
` (2 preceding siblings ...)
2022-09-01 9:43 ` [bug#57515] [PATCH 9/9] tests/gnu-maintenance: Test latest-html-release Maxime Devos
@ 2022-09-26 20:35 ` Ludovic Courtès
3 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2022-09-26 20:35 UTC (permalink / raw)
To: Maxime Devos; +Cc: 57515-done
Hi,
Maxime Devos <maximedevos@telenet.be> skribis:
> guix: Extract logic of the check-mirror-url.
> gnu-maintenance: Produce mirror:// URIs in latest-ftp-release.
> gnu-maintenance: Produce mirror:// URIs in latest-html-release.
> download: Switch savannah mirrors to HTTPS URLs.
> gnu-maintenance: Simplify latest-savannah-release.
> download: Add a kernel.org mirror.
> gnu-maintenance: Simplify latest-kernel.org-release.
> gnu-maintenance: Remove unused procedures.
I applied the whole series, with cosmetic changes on the first patch
and minor tweaks to the commit logs.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-26 20:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-01 9:00 [bug#57515] [PATCH 0/8] Stop unmirroring during updates Maxime Devos
2022-09-01 9:05 ` Maxime Devos
2022-09-01 10:13 ` Maxime Devos
2022-09-01 9:27 ` Maxime Devos
2022-09-01 9:43 ` [bug#57515] [PATCH 9/9] tests/gnu-maintenance: Test latest-html-release Maxime Devos
2022-09-26 20:35 ` bug#57515: [PATCH 0/8] Stop unmirroring during updates Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.