amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu-maintenance: Consider Qt source tarballs as "release files".

Browse source 
* guix/gnu-maintenance.scm (release-file?): Use positive logic in doc.
Add a special case for Qt source archives.
* tests/gnu-maintenance.scm ("release-file?"): Update test.
This commit is contained in:
Maxim Cournoyer 2023-08-11 13:44:28 -04:00
parent bdaef69556
commit 1dce887776
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
guix/gnu-maintenance.scm
View file

@ -258,8 +258,7 @@ network to check in GNU's database."
(make-regexp "^.*-.*[0-9](-|~|\\.)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\.")) (make-regexp "^.*-.*[0-9](-|~|\\.)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))
(define (release-file? project file) (define (release-file? project file)
"Return #f if FILE is not a release tarball of PROJECT, otherwise return "Return true if FILE is a release tarball of PROJECT."
true."
(and (not (member (file-extension file) (and (not (member (file-extension file)
'("sig" "sign" "asc" '("sig" "sign" "asc"
"md5sum" "sha1sum" "sha256sum"))) "md5sum" "sha1sum" "sha256sum")))
@ -268,12 +267,21 @@ true."
;; Filter out unrelated files, like `guile-www-1.1.1'. ;; Filter out unrelated files, like `guile-www-1.1.1'.
;; Case-insensitive for things like "TeXmacs" vs. "texmacs". ;; Case-insensitive for things like "TeXmacs" vs. "texmacs".
;; The "-src" suffix is for "freefont-src-20120503.tar.gz". ;; The "-src" suffix is for "freefont-src-20120503.tar.gz".
;; The '-everywhere-src' suffix is for Qt modular components.
(and=> (match:substring match 1) (and=> (match:substring match 1)
(lambda (name) (lambda (name)
(or (string-ci=? name project) (or (string-ci=? name project)
(string-ci=? name (string-ci=? name (string-append project "-src"))
(string-append project (string-ci=?
"-src"))))))) name (string-append project "-everywhere-src"))
;; For older Qt releases such as version 5.
(string-ci=?
name (string-append
project "-everywhere-opensource-src"))
;; For Qt Creator.
(string-ci=?
name (string-append
project "-opensource-src")))))))
(not (regexp-exec %alpha-tarball-rx file)) (not (regexp-exec %alpha-tarball-rx file))
(let ((s (tarball-sans-extension file))) (let ((s (tarball-sans-extension file)))
(regexp-exec %package-name-rx s)))) (regexp-exec %package-name-rx s))))

5
tests/gnu-maintenance.scm
View file

@ -40,7 +40,10 @@
("exiv2" "exiv2-0.27.3-Source.tar.gz") ("exiv2" "exiv2-0.27.3-Source.tar.gz")
("mpg321" "mpg321_0.3.2.orig.tar.gz") ("mpg321" "mpg321_0.3.2.orig.tar.gz")
("bvi" "bvi-1.4.1.src.tar.gz") ("bvi" "bvi-1.4.1.src.tar.gz")
("hostscope" "hostscope-V2.1.tgz"))) ("hostscope" "hostscope-V2.1.tgz")
("qtbase" "qtbase-everywhere-src-6.5.2.tar.xz")
("qtbase" "qtbase-everywhere-opensource-src-5.15.10.tar.xz")
("qt-creator" "qt-creator-opensource-src-11.0.1.tar.xz")))
(every (lambda (project+file) (every (lambda (project+file)
(not (apply release-file? project+file))) (not (apply release-file? project+file)))
'(("guile" "guile-www-1.1.1.tar.gz") '(("guile" "guile-www-1.1.1.tar.gz")