local/build-all.R

@@ -110,10 +110,25 @@ con <- DBI::dbConnect(
   password = Sys.getenv("PGPASS"),
   sslmode = "require"
 )
+# Scope the skip to the R minor this pass is running under. `single_builds`
+# records `r_version` per attempt, but querying without it made a non-primary
+# pass skip everything the primary pass had already attempted under a different
+# minor - so `--sensitive-only` under 4.6 skipped packages that had only ever
+# been built for 4.5, and the per-minor slots never filled. That is why
+# amd64/resolute served 4000 fewer packages to a 4.6 client than to a 4.5 one.
+r_minor <- paste(
+  R.version$major,
+  strsplit(R.version$minor, ".", fixed = TRUE)[[1L]][1L],
+  sep = "."
+)
 built <- DBI::dbGetQuery(
   con,
-  "SELECT name, tag FROM single_builds WHERE platform = $1 AND arch = $2",
-  params = list(platform, arch)
+  paste(
+    "SELECT name, tag FROM single_builds",
+    "WHERE platform = $1 AND arch = $2",
+    "AND substring(r_version from '^[0-9]+[.][0-9]+') = $3"
+  ),
+  params = list(platform, arch, r_minor)
 )
 DBI::dbDisconnect(con)
 before <- nrow(chunk)
@@ -121,8 +136,9 @@ chunk <- chunk[
   !paste(chunk$Package, chunk$Version) %in% paste(built$name, built$tag),
 ]
 sprintf(
-  "Skipped %d already-attempted package versions; %d remaining for this job",
+  "Skipped %d package versions already attempted under R %s; %d remaining for this job",
   before - nrow(chunk),
+  r_minor,
   nrow(chunk)
 )