From 6403ad602fef03eb77a0cf6ef056986488b9a23b Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Mon, 25 May 2026 22:27:35 +0200
Subject: [PATCH] refactor(ci): use multi-R-version images in
 build-all-versions workflows

Drop -${R_VERSION} from the image tag and invoke R/Rscript via the
explicit /opt/R/${R_VERSION}/bin/ path.
---
 .crow/build-all-versions-amd64.yaml              | 6 +++---
 .crow/build-all-versions-arm64.yaml              | 6 +++---
 .crow/build-all-versions-install-deps-amd64.yaml | 6 +++---
 .crow/build-all-versions-install-deps-arm64.yaml | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.crow/build-all-versions-amd64.yaml b/.crow/build-all-versions-amd64.yaml
index 4c10387..e5590fb 100644
--- a/.crow/build-all-versions-amd64.yaml
+++ b/.crow/build-all-versions-amd64.yaml
@@ -39,7 +39,7 @@ depends_on:
 
 steps:
   - name: 'Build binaries'
-    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}-${R_VERSION}
+    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}
     pull: true
     environment:
       RED_HAT_DEV_PW:
@@ -69,9 +69,9 @@ steps:
       # Windows-only: 'RInno', 'KeyboardSimulator', 'R2PPT', 'RWinEdt', 'blatr', 'excel.link', 'spectrino', 'taskscheduleR', 'MDSGUI', 'BiplotGUI', 'R2wd', 'rFUSION', 'MediaNews', 'rFUSION', 'MediaNews'
       # pkgs = readRDS('/mnt/cache/pkgs_amd64.rds');
       - 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 -- Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
+      - $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- /opt/R/${R_VERSION}/bin/Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
       # archive missed packages
-      - R -q -e "bincraft::process_unarchived_pkgs(paste(Sys.getenv('OS'), Sys.getenv('OS_VERSION')), Sys.getenv('ARCH'), workers = $NCPUS)"
+      - /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)"
     backend_options:
       docker:
         resources:
diff --git a/.crow/build-all-versions-arm64.yaml b/.crow/build-all-versions-arm64.yaml
index eb1a5c2..2829bc9 100644
--- a/.crow/build-all-versions-arm64.yaml
+++ b/.crow/build-all-versions-arm64.yaml
@@ -54,7 +54,7 @@ depends_on:
 
 steps:
   - name: 'Build binaries'
-    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}-${R_VERSION}
+    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}
     pull: true
     environment:
       RED_HAT_DEV_PW:
@@ -82,9 +82,9 @@ steps:
       - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
       - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
       - 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 -- Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
+      - $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- /opt/R/${R_VERSION}/bin/Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
       # archive missed packages
-      - R -q -e "bincraft::process_unarchived_pkgs(paste(Sys.getenv('OS'), Sys.getenv('OS_VERSION')), Sys.getenv('ARCH'), workers = $NCPUS)"
+      - /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)"
     backend_options:
       docker:
         resources:
diff --git a/.crow/build-all-versions-install-deps-amd64.yaml b/.crow/build-all-versions-install-deps-amd64.yaml
index c41789f..f3d61f0 100644
--- a/.crow/build-all-versions-install-deps-amd64.yaml
+++ b/.crow/build-all-versions-install-deps-amd64.yaml
@@ -10,7 +10,7 @@ labels:
 
 steps:
   - name: 'Install deps and bincraft'
-    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}-${R_VERSION}
+    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}
     pull: true
     environment:
       REPO_RO_TOKEN:
@@ -34,8 +34,8 @@ steps:
       - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
       - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
       - git clone -q https://codefloe.com/rpkgs/bincraft.git /tmp/bincraft
-      - R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future")); packageVersion("bincraft")'
-      - R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s package versions to build', nrow(pkgs))"
+      - /opt/R/${R_VERSION}/bin/R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future")); packageVersion("bincraft")'
+      - /opt/R/${R_VERSION}/bin/R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s package versions to build', nrow(pkgs))"
     backend_options:
       docker:
         resources:
diff --git a/.crow/build-all-versions-install-deps-arm64.yaml b/.crow/build-all-versions-install-deps-arm64.yaml
index dbd1df3..e6e65ec 100644
--- a/.crow/build-all-versions-install-deps-arm64.yaml
+++ b/.crow/build-all-versions-install-deps-arm64.yaml
@@ -9,7 +9,7 @@ labels:
 
 steps:
   - name: 'Install deps and bincraft'
-    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}-${R_VERSION}
+    image: reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}
     pull: true
     environment:
       REPO_RO_TOKEN:
@@ -33,8 +33,8 @@ steps:
       - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
       - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
       - git clone -q https://codefloe.com/rpkgs/bincraft.git /tmp/bincraft
-      - R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future")); packageVersion("bincraft")'
-      - R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s package versions to build', nrow(pkgs))"
+      - /opt/R/${R_VERSION}/bin/R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future")); packageVersion("bincraft")'
+      - /opt/R/${R_VERSION}/bin/R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s package versions to build', nrow(pkgs))"
     backend_options:
       docker:
         resources: