Merge remote-tracking branch 'origin/main' into t3code/smarter-disk-pruning-macmini

# Conflicts:
#	.crow/build-all-versions-install-deps.yaml
#	.crow/build-all-versions.yaml

.crow/build-all-versions.yaml

@@ -11,11 +11,25 @@ variables:
       - arm64
     default: amd64
   OS:
-    description: 'Base OS image name (e.g. alpine, redhat, ubuntu).'
+    description: "Base OS image name."
+    options:
+      - alpine
+      - redhat
+      - ubuntu
     default: alpine
   OS_VERSION:
-    description: 'OS version / image tag (e.g. 3.24, 9, jammy, noble).'
-    default: '3.24'
+    description: "OS image tag. Must match OS (alpine: 3.24; redhat: 8/9/10; ubuntu: jammy/noble)."
+    options:
+      - "3.22"
+      - "3.23"
+      - "3.24"
+      - "8"
+      - "9"
+      - "10"
+      - "jammy"
+      - "noble"
+      - "resolute"
+    default: "3.24"
   R_VERSION:
     description: 'Primary R version under /opt/R.'
     options:
@@ -76,6 +90,9 @@ steps:
     image: 'reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}'
     pull: true
     environment:
+      OTEL_R_TRACES_EXPORTER: none
+      OTEL_R_LOGS_EXPORTER: none
+      OTEL_R_METRICS_EXPORTER: none
       RED_HAT_DEV_PW:
         from_secret: RED_HAT_DEV_PW
       B2_S3_ACCESS_KEY:
@@ -105,6 +122,14 @@ steps:
       # growth is bounded separately by trim_pkgcache_metadata() in build-all.R.
       - rm -rf /mnt/cache/pkgcache/R/pkgcache/_metadata/patched-* /mnt/cache/pkgcache/R/pkgcache/_metadata/pkgs-*.rds || true
       - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
+      # The primary pass must not rely on build-all-versions-install-deps having
+      # run on *this* agent: depends_on only orders the steps, but the cache
+      # volume is per-agent, so a job landing on an agent where install-deps did
+      # not run would otherwise use a stale bincraft (which resolves `platform`
+      # to a zero-length value and breaks every metadata query and the sysdeps
+      # install). Pin bincraft here, exactly like the R-minor pass below.
+      - rm -rf /mnt/cache/R-pkgs/00LOCK-*
+      - /opt/R/$R_VERSION/bin/Rscript local/install-bincraft.R
       - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS=""; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
       - $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- /opt/R/$R_VERSION/bin/Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
       - |
@@ -116,11 +141,12 @@ steps:
           echo "=== R-minor-sensitive pass under R $RV ==="
           LIB="/mnt/cache/R-pkgs-$RMINOR"
           mkdir -p "$LIB"
-          R_LIBS_USER="$LIB" "$(dirname "$RBIN")/R" -q -e 'if (!requireNamespace("bincraft", quietly = TRUE) || packageVersion("bincraft") != "4.2.2") pak::pak("git::https://codefloe.com/rpkgs/bincraft.git@v4.2.2")' || true
+          R_LIBS_USER="$LIB" "$(dirname "$RBIN")/Rscript" local/install-bincraft.R || true
           R_LIBS_USER="$LIB" $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- "$(dirname "$RBIN")/Rscript" local/build-all.R --sensitive-only $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1 || true
         done
-      # archive missed packages
-      - /opt/R/$R_VERSION/bin/R -q -e "bincraft::process_unarchived_pkgs(paste(Sys.getenv('OS'), Sys.getenv('OS_VERSION')), Sys.getenv('ARCH'), workers = $NCPUS)"
+      # archive missed packages; first arg is the codename (e.g. "alpine324"),
+      # derived via bincraft like the upload step, not paste(OS, OS_VERSION).
+      - /opt/R/$R_VERSION/bin/R -q -e "bincraft::process_unarchived_pkgs(bincraft::set_codename(NULL), Sys.getenv('ARCH'), s3_endpoint = 'https://s3.eu-central-003.backblazeb2.com', s3_region = 'eu-central-003', s3_bucket = 'devxy-rpkgs-binaries', s3_access_key_id = Sys.getenv('B2_S3_ACCESS_KEY'), s3_secret_access_key = Sys.getenv('B2_S3_SECRET_KEY'), workers = $NCPUS)"
     backend_options:
       docker:
         resources:
@@ -134,6 +160,9 @@ steps:
     image: 'reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}'
     pull: true
     environment:
+      OTEL_R_TRACES_EXPORTER: none
+      OTEL_R_LOGS_EXPORTER: none
+      OTEL_R_METRICS_EXPORTER: none
       B2_S3_ACCESS_KEY:
         from_secret: B2_S3_ACCESS_KEY
       B2_S3_SECRET_KEY: