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.
This commit is contained in:
parent
754a076e33
commit
6403ad602f
1 changed files with 12 additions and 12 deletions
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue