devxy/build-cran-binaries
Watch
1
0
Fork
You've already forked build-cran-binaries
 0
Code Issues 10 Pull requests Releases Activity

perf(local): skip per-minor passes for non-r-minor-sensitive packages

Browse source 
A package's ABI sensitivity is the same across R minors, so for a non-sensitive
package the per-minor loop only ran `ensure_bincraft` (a ~14s bincraft/cranlike
install per minor) before build-one.R classified and skipped it. The primary
pass now writes a .r_minor_sensitive sentinel when it builds a sensitive
package, and the wrapper gates the whole per-minor loop (installs included) on
that file — non-sensitive rebuilds no longer touch other minors' libraries.
This commit is contained in:
Patrick Schratz 2026-06-14 14:50:40 +02:00
commit 7e01f481c0
Signed by: pat-s
GPG key ID: 3C6318841EF78925
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
docker/build-one.Dockerfile
View file

@ -41,20 +41,25 @@ RUN --mount=type=secret,id=b2_access,required=true \
PRIMARY_MINOR=$(echo "$R_VERSION" | cut -d. -f1-2); \
seen=" $PRIMARY_MINOR "; \
prc=0; failed=""; \
rm -f .r_minor_sensitive; \
echo "=== primary pass under R $R_VERSION ==="; \
ensure_bincraft /opt/R/${R_VERSION}/bin/R; \
run_build /opt/R/${R_VERSION}/bin/Rscript /work/build-one.R "${PACKAGE}" ${VERSIONS} || prc=$?; \
for RBIN in /opt/R/*/bin/Rscript; do \
[ -x "$RBIN" ] || continue; \
RV=$(basename "$(dirname "$(dirname "$RBIN")")"); \
case "$RV" in [0-9]*) ;; *) continue ;; esac; \
RMINOR=$(echo "$RV" | cut -d. -f1-2); \
case "$seen" in *" $RMINOR "*) continue ;; esac; \
seen="$seen$RMINOR "; \
echo "=== sensitive-only pass under R $RV ==="; \
ensure_bincraft "$(dirname "$RBIN")/R"; \
run_build "$RBIN" /work/build-one.R --sensitive-only "${PACKAGE}" ${VERSIONS} || failed="$failed $RV"; \
done; \
if [ -f .r_minor_sensitive ]; then \
for RBIN in /opt/R/*/bin/Rscript; do \
[ -x "$RBIN" ] || continue; \
RV=$(basename "$(dirname "$(dirname "$RBIN")")"); \
case "$RV" in [0-9]*) ;; *) continue ;; esac; \
RMINOR=$(echo "$RV" | cut -d. -f1-2); \
case "$seen" in *" $RMINOR "*) continue ;; esac; \
seen="$seen$RMINOR "; \
echo "=== sensitive-only pass under R $RV ==="; \
ensure_bincraft "$(dirname "$RBIN")/R"; \
run_build "$RBIN" /work/build-one.R --sensitive-only "${PACKAGE}" ${VERSIONS} || failed="$failed $RV"; \
done; \
else \
echo "Package not r-minor-sensitive; skipping per-minor passes."; \
fi; \
if [ -n "$failed" ]; then echo "WARNING: extra-minor build(s) failed (non-fatal; e.g. a version too old to compile on a newer R):$failed" >&2; fi; \
if [ "$prc" != 0 ]; then echo "primary pass under R $R_VERSION failed (exit $prc)" >&2; fi; \
exit "$prc"

7
local/build-one.R
View file

@ -120,6 +120,13 @@ for (ver in versions) {
if (sensitive) touched_minor <- TRUE else touched_generic <- TRUE
}
# Signal the container wrapper whether per-minor passes are warranted (a single
# package's sensitivity is the same across R minors, so a non-sensitive package
# need not touch any other minor's library).
if (touched_minor) {
file.create(".r_minor_sensitive")
}
# Refresh the PACKAGES index for each slot we wrote to, so the (re)built binary
# is immediately resolvable by clients.
codename <- bincraft::set_codename(NULL)