* [bug#33809] [PATCH] refresh: github: updates for origins using 'git-fetch'.
@ 2018-12-20 2:39 ericbavier
2018-12-26 17:26 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: ericbavier @ 2018-12-20 2:39 UTC (permalink / raw)
To: 33809; +Cc: Eric Bavier
From: Eric Bavier <bavier@member.fsf.org>
* guix/import/github.scm (updated-github-url): Respond with the repository url
for the 'git-fetch' fetch method.
(github-package?): Simplify boolean expression.
(github-repository, github-user-slash-repository): Strip trailing ".git" from
project if present.
(latest-release)<origin-github-uri>: Recognize a 'git-reference'.
---
Hello Guix,
With our increasing adoption of git checkouts from github, for
reproducibility reasons, I thought it would be nice if our github updater
could find updates for package origins that use `git-fetch`.
This patch brings the github updater coverage up from 9.5% to 15.9%. At the
time of this writing, the previous updater finds 254 updates, and with this
patch finds 385! :)
guix/import/github.scm | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/guix/import/github.scm b/guix/import/github.scm
index af9f56e1d..ad662e7b0 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
#:use-module (srfi srfi-34)
#:use-module (guix utils)
#:use-module ((guix download) #:prefix download:)
+ #:use-module ((guix git-download) #:prefix download:)
#:use-module (guix import utils)
#:use-module (guix import json)
#:use-module (guix packages)
@@ -52,6 +54,7 @@ false if none is recognized"
(github-user-slash-repository url)))
(repo (github-repository url)))
(cond
+ ((string-suffix? ".git" url) url)
((string-suffix? (string-append "/tarball/v" version) url)
(string-append prefix "/tarball/v" new-version))
((string-suffix? (string-append "/tarball/" version) url)
@@ -86,26 +89,29 @@ false if none is recognized"
(#t #f))) ; Some URLs are not recognised.
#f))
- (let ((source-url (and=> (package-source old-package) origin-uri))
+ (let ((source-uri (and=> (package-source old-package) origin-uri))
(fetch-method (and=> (package-source old-package) origin-method)))
- (if (eq? fetch-method download:url-fetch)
- (match source-url
- ((? string?)
- (updated-url source-url))
- ((source-url ...)
- (find updated-url source-url)))
- #f)))
+ (cond
+ ((eq? fetch-method download:url-fetch)
+ (match source-uri
+ ((? string?)
+ (updated-url source-uri))
+ ((source-uri ...)
+ (find updated-url source-uri))))
+ ((eq? fetch-method download:git-fetch)
+ (updated-url (download:git-reference-url source-uri)))
+ (else #f))))
(define (github-package? package)
"Return true if PACKAGE is a package from GitHub, else false."
- (not (eq? #f (updated-github-url package "dummy"))))
+ (->bool (updated-github-url package "dummy")))
(define (github-repository url)
"Return a string e.g. bedtools2 of the name of the repository, from a string
URL of the form 'https://github.com/arq5x/bedtools2/archive/v2.24.0.tar.gz'"
(match (string-split (uri-path (string->uri url)) #\/)
((_ owner project . rest)
- (string-append project))))
+ (string-append (basename project ".git")))))
(define (github-user-slash-repository url)
"Return a string e.g. arq5x/bedtools2 of the owner and the name of the
@@ -113,7 +119,7 @@ repository separated by a forward slash, from a string URL of the form
'https://github.com/arq5x/bedtools2/archive/v2.24.0.tar.gz'"
(match (string-split (uri-path (string->uri url)) #\/)
((_ owner project . rest)
- (string-append owner "/" project))))
+ (string-append owner "/" (basename project ".git")))))
(define %github-token
;; Token to be passed to Github.com to avoid the 60-request per hour
@@ -213,6 +219,8 @@ https://github.com/settings/tokens"))
(match (origin-uri origin)
((? string? url)
url) ;surely a github.com URL
+ ((? download:git-reference? ref)
+ (download:git-reference-url ref))
((urls ...)
(find (cut string-contains <> "github.com") urls))))
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#33809] [PATCH] refresh: github: updates for origins using 'git-fetch'.
2018-12-20 2:39 [bug#33809] [PATCH] refresh: github: updates for origins using 'git-fetch' ericbavier
@ 2018-12-26 17:26 ` Ludovic Courtès
2019-01-01 1:48 ` bug#33809: " Eric Bavier
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2018-12-26 17:26 UTC (permalink / raw)
To: ericbavier; +Cc: 33809, Eric Bavier
Hi Eric,
ericbavier@centurylink.net skribis:
> From: Eric Bavier <bavier@member.fsf.org>
>
> * guix/import/github.scm (updated-github-url): Respond with the repository url
> for the 'git-fetch' fetch method.
> (github-package?): Simplify boolean expression.
> (github-repository, github-user-slash-repository): Strip trailing ".git" from
> project if present.
> (latest-release)<origin-github-uri>: Recognize a 'git-reference'.
> ---
>
> Hello Guix,
>
> With our increasing adoption of git checkouts from github, for
> reproducibility reasons, I thought it would be nice if our github updater
> could find updates for package origins that use `git-fetch`.
>
> This patch brings the github updater coverage up from 9.5% to 15.9%. At the
> time of this writing, the previous updater finds 254 updates, and with this
> patch finds 385! :)
Neat!
LGTM, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#33809: [PATCH] refresh: github: updates for origins using 'git-fetch'.
2018-12-26 17:26 ` Ludovic Courtès
@ 2019-01-01 1:48 ` Eric Bavier
0 siblings, 0 replies; 3+ messages in thread
From: Eric Bavier @ 2019-01-01 1:48 UTC (permalink / raw)
Cc: 33809-done
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
On Wed, 26 Dec 2018 18:26:06 +0100
Ludovic Courtès <ludo@gnu.org> wrote:
> Hi Eric,
>
> ericbavier@centurylink.net skribis:
>
> > From: Eric Bavier <bavier@member.fsf.org>
> >
> > * guix/import/github.scm (updated-github-url): Respond with the repository url
> > for the 'git-fetch' fetch method.
> > (github-package?): Simplify boolean expression.
> > (github-repository, github-user-slash-repository): Strip trailing ".git" from
> > project if present.
> > (latest-release)<origin-github-uri>: Recognize a 'git-reference'.
> > ---
> >
> > Hello Guix,
> >
> > With our increasing adoption of git checkouts from github, for
> > reproducibility reasons, I thought it would be nice if our github updater
> > could find updates for package origins that use `git-fetch`.
> >
> > This patch brings the github updater coverage up from 9.5% to 15.9%. At the
> > time of this writing, the previous updater finds 254 updates, and with this
> > patch finds 385! :)
>
> Neat!
>
> LGTM, thank you!
Pushed in 789fc77bef3601ceb49ea96d84dbe9e9286dca75
`~Eric
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-01 1:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-20 2:39 [bug#33809] [PATCH] refresh: github: updates for origins using 'git-fetch' ericbavier
2018-12-26 17:26 ` Ludovic Courtès
2019-01-01 1:48 ` bug#33809: " Eric Bavier
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.