From 2eb699cf495165a4c5bbf773e8f9e1aa673345ff Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 12 Feb 2026 10:54:35 +0000 Subject: [PATCH] Support skipping lint warnings --- guix-data-service/jobs.scm | 4 ++++ guix-data-service/jobs/load-new-guix-revision.scm | 13 ++++++++++--- scripts/guix-data-service-process-job.in | 4 ++++ scripts/guix-data-service-process-jobs.in | 5 +++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/guix-data-service/jobs.scm b/guix-data-service/jobs.scm index 85c4c2e..a910fec 100644 --- a/guix-data-service/jobs.scm +++ b/guix-data-service/jobs.scm @@ -142,6 +142,7 @@ WHERE load_new_guix_revision_jobs.id = $1" (define* (process-jobs conn #:key max-processes latest-branch-revision-max-processes skip-system-tests? + skip-lint-warnings? extra-inferior-environment-variables per-job-parallelism ignore-systems @@ -171,6 +172,9 @@ WHERE load_new_guix_revision_jobs.id = $1" ,@(if skip-system-tests? '("--skip-system-tests") '()) + ,@(if skip-lint-warnings? + '("--skip-lint-warnings") + '()) ,@(map (match-lambda ((key . val) (simple-format #f "--inferior-set-environment-variable=~A=~A" diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 3e9cfe4..5a03695 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -2998,6 +2998,7 @@ WHERE builder != 'builtin:download' call-with-utility-thread read-derivations/serialised #:key skip-system-tests? + skip-lint-warnings? extra-inferior-environment-variables parallelism ignore-systems ignore-targets @@ -3487,8 +3488,9 @@ WHERE builder != 'builtin:download' (extract-and-store-channel-news) (extract-and-store-package-derivations) (retry-on-missing-store-item extract-and-store-system-tests) - (with-time-logging "extract-and-store-lint-checkers-and-warnings" - (extract-and-store-lint-checkers-and-warnings)))) + (unless skip-lint-warnings? + (with-time-logging "extract-and-store-lint-checkers-and-warnings" + (extract-and-store-lint-checkers-and-warnings))))) (close-table-manager table-manager-coordinator "systems") @@ -3636,7 +3638,8 @@ WHERE builder != 'builtin:download' channel-news-entry-ids))) (define* (load-new-guix-revision conn git-repository-id commit - #:key skip-system-tests? parallelism + #:key skip-system-tests? + skip-lint-warnings? parallelism extra-inferior-environment-variables ignore-systems ignore-targets inferior-memory-limit) @@ -3810,6 +3813,8 @@ WHERE builder != 'builtin:download' read-derivations/serialised #:skip-system-tests? skip-system-tests? + #:skip-lint-warnings? + skip-lint-warnings? #:extra-inferior-environment-variables extra-inferior-environment-variables #:ignore-systems ignore-systems @@ -4240,6 +4245,7 @@ SKIP LOCKED") (prevent-inlining-for-tests with-store-connection) (define* (process-load-new-guix-revision-job id #:key skip-system-tests? + skip-lint-warnings? extra-inferior-environment-variables ignore-systems ignore-targets @@ -4341,6 +4347,7 @@ SKIP LOCKED") git-repository-id commit #:skip-system-tests? skip-system-tests? + #:skip-lint-warnings? skip-lint-warnings? #:extra-inferior-environment-variables extra-inferior-environment-variables #:ignore-systems ignore-systems diff --git a/scripts/guix-data-service-process-job.in b/scripts/guix-data-service-process-job.in index eaf38bc..eabd0a2 100644 --- a/scripts/guix-data-service-process-job.in +++ b/scripts/guix-data-service-process-job.in @@ -46,6 +46,9 @@ (list (option '("skip-system-tests") #f #f (lambda (opt name _ result) (alist-cons 'skip-system-tests #t result))) + (option '("skip-lint-warnings") #f #f + (lambda (opt name _ result) + (alist-cons 'skip-lint-warnings #t result))) (option '("parallelism") #t #f (lambda (opt name arg result) (alist-cons 'parallelism @@ -116,6 +119,7 @@ (process-load-new-guix-revision-job job #:skip-system-tests? (assq-ref opts 'skip-system-tests) + #:skip-lint-warnings? (assq-ref opts 'skip-lint-warnings) #:extra-inferior-environment-variables (filter-map (match-lambda diff --git a/scripts/guix-data-service-process-jobs.in b/scripts/guix-data-service-process-jobs.in index bc77874..71b3f0a 100644 --- a/scripts/guix-data-service-process-jobs.in +++ b/scripts/guix-data-service-process-jobs.in @@ -47,6 +47,9 @@ (option '("skip-system-tests") #f #f (lambda (opt name _ result) (alist-cons 'skip-system-tests #t result))) + (option '("skip-lint-warnings") #f #f + (lambda (opt name _ result) + (alist-cons 'skip-lint-warnings #t result))) (option '("per-job-parallelism") #t #f (lambda (opt name arg result) (alist-cons 'per-job-parallelism @@ -131,6 +134,8 @@ (* 2 (assq-ref opts 'max-processes))) #:skip-system-tests? (assq-ref opts 'skip-system-tests) + #:skip-lint-warnings? + (assq-ref opts 'skip-lint-warnings) #:extra-inferior-environment-variables (filter-map (match-lambda