Tweak some post extract-information-from actions

Move update-package-derivations-table further on since it locks a table, and
use let for the guix-revision-id.
This commit is contained in:
Christopher Baines 2025-04-19 13:05:16 +01:00
parent 1c0b216067
commit ce01df5211

View file

@ -2604,35 +2604,37 @@ SELECT store_path FROM derivation_source_files WHERE id = $1"
#:ignore-systems ignore-systems #:ignore-systems ignore-systems
#:ignore-targets ignore-targets #:ignore-targets ignore-targets
#:parallelism parallelism) #:parallelism parallelism)
(let ((guix-revision-id
(fibers-force guix-revision-id-promise)))
(and
(if (defined? 'channel-news-for-commit (if (defined? 'channel-news-for-commit
(resolve-module '(guix channels))) (resolve-module '(guix channels)))
(with-time-logging "inserting channel news entries" (with-time-logging "inserting channel news entries"
(insert-channel-news-entries-for-guix-revision (insert-channel-news-entries-for-guix-revision
conn conn
(fibers-force guix-revision-id-promise) guix-revision-id
(channel-news-for-commit channel-for-commit commit))) (channel-news-for-commit channel-for-commit commit)))
(begin (begin
(simple-format (simple-format
#t "debug: importing channel news not supported\n") #t "debug: importing channel news not supported\n")
#t)) #t))
(update-package-derivations-table
conn
git-repository-id
(fibers-force guix-revision-id-promise)
commit)
(with-time-logging "updating builds.derivation_output_details_set_id" (with-time-logging "updating builds.derivation_output_details_set_id"
(update-builds-derivation-output-details-set-id (update-builds-derivation-output-details-set-id
conn conn
(fibers-force guix-revision-id-promise))) guix-revision-id))
(update-package-derivations-table
conn
git-repository-id
guix-revision-id
commit)
(let ((stats (gc-stats))) (let ((stats (gc-stats)))
(format (current-error-port) (format (current-error-port)
"gc-stats: time taken: ~3fs, times: ~d~%" "gc-stats: time taken: ~3fs, times: ~d~%"
(/ (assq-ref stats 'gc-time-taken) (/ (assq-ref stats 'gc-time-taken)
internal-time-units-per-second) internal-time-units-per-second)
(assq-ref stats 'gc-times)) (assq-ref stats 'gc-times))
#t)) #t))))
(begin (begin
(simple-format #t "Failed to generate store item for ~A\n" (simple-format #t "Failed to generate store item for ~A\n"
commit) commit)