cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Insert channel news entries when loading new guix revisions

Browse source 
If the channel-news-for-commit function is present.
This commit is contained in:
Christopher Baines 2019-11-18 19:49:12 +00:00
parent 2e8ca7f547
commit f23ee71ea7
2 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -17,6 +17,7 @@
#:use-module (guix build utils)
#:use-module (guix-data-service config)
#:use-module (guix-data-service database)
#:use-module (guix-data-service model channel-news)
#:use-module (guix-data-service model package)
#:use-module (guix-data-service model git-repository)
#:use-module (guix-data-service model guix-revision)
@ -1047,6 +1048,15 @@ ORDER BY packages.name, packages.version"
commit store-item)))
(and
guix-revision-id
(if (defined? 'channel-news-for-commit)
(insert-channel-news-entries-for-guix-revision
conn
guix-revision-id
(channel-news-for-commit channel-for-commit commit))
(begin
(simple-format #t "debug: importing channel news not supported\n")
#t))
(extract-information-from conn guix-revision-id
commit store-item)
(update-package-versions-table conn git-repository-id commit)

22
tests/jobs-load-new-guix-revision.scm
View file

@ -14,6 +14,8 @@
(with-postgresql-connection
"test-jobs-load-new-guix-revision"
(lambda (conn)
(exec-query conn "TRUNCATE guix_revisions CASCADE")
(test-equal "select-job-for-commit works"
'()
(select-job-for-commit conn "does not exist"))
@ -29,17 +31,24 @@
(mock
((guix-data-service jobs load-new-guix-revision)
extract-information-from
(lambda (conn git-repository-id commit store-path)
(lambda (conn guix-revision-id commit store-path)
#t))
(mock
((guix channels)
channel-news-for-commit
(lambda (channel commit)
'()))
(match (enqueue-load-new-guix-revision-job
conn
(git-repository-url->git-repository-id conn "test-url")
"test-commit"
"test-source")
((id)
(process-load-new-guix-revision-job id))))))
(process-load-new-guix-revision-job id)))))))
(exec-query conn "TRUNCATE guix_revisions CASCADE")
(exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")
(test-equal "test build store item failure"
@ -74,13 +83,19 @@
(lambda (conn git-repository-id commit store-path)
#f))
(mock
((guix channels)
channel-news-for-commit
(lambda (channel commit)
'()))
(match (enqueue-load-new-guix-revision-job
conn
(git-repository-url->git-repository-id conn "test-url")
"test-commit"
"test-source")
((id)
(process-load-new-guix-revision-job id))))))
(process-load-new-guix-revision-job id)))))))
(exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")
@ -101,5 +116,4 @@
#t)
#:always-rollback? #t))))
(test-end)