From e8e69306a429e199a8474e4ef3efb6a21feab3b9 Mon Sep 17 00:00:00 2001 From: pat-s Date: Thu, 5 Sep 2024 13:17:47 +0200 Subject: [PATCH] renamings --- .woodpecker/build.yaml | 6 +++--- .woodpecker/process_cran_updates.yaml | 4 ++-- .woodpecker/update-package-index.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 7ed1e86..c55a714 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -45,11 +45,11 @@ steps: commands: # download latest package version (avoid having to rebuild image every time) # rscript_startup arg: required to pass down global option to future workers https://github.com/HenrikBengtsson/future/issues/134#issuecomment-2245666169 - - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/arm64-r-binaries.git . - - rm -rf /mnt/cache/R-pkgs/00LOCK-arm64-r-binaries /mnt/cache/R-pkgs/00LOCK-bincraftR + - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/r-pkg-binaries.git . + - rm -rf /mnt/cache/R-pkgs/00LOCK-r-pkg-binaries /mnt/cache/R-pkgs/00LOCK-bincraftR # for some reason this one is often corrupt on redhat-9 - rm -rf /mnt/cache/R-pkgs/RPostgres /mnt/cache/pkgcache/R/pkgcache - - R -q -e 'devtools::install(quiet = TRUE); packageVersion("bincraftR")' + - R CMD INSTALL . - mkdir -p /root/.R && /bin/bash -c 'echo -e "CXX_STD = CXX14\nCC=ccache gcc\nCPP=ccache gcc\nCXX=ccache g++\nCXX11=ccache g++\nCXX14=ccache g++\nCXX17=ccache g++\nF77=ccache /usr/bin/gfortran\nFC=ccache /usr/bin/gfortran" >> /root/.R/Makevars' # manually install some packages into the cache so that some builds don't fail # Hmisc -> ABCanalysis diff --git a/.woodpecker/process_cran_updates.yaml b/.woodpecker/process_cran_updates.yaml index 71e4896..9739442 100644 --- a/.woodpecker/process_cran_updates.yaml +++ b/.woodpecker/process_cran_updates.yaml @@ -39,8 +39,8 @@ steps: - arm64-binaries-r-dep-cache-${PLATFORM}:/mnt/cache commands: # download latest package version (avoid having to rebuild image every time) - - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/arm64-r-binaries.git . - - rm -rf /mnt/cache/R-pkgs/00LOCK-arm64-r-binaries /mnt/cache/R-pkgs/00LOCK-bincraftR /opt/R/*/lib/R/library/RPostgres /mnt/cache/R-pkgs/00LOCK-RPostgres + - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/r-pkg-binaries.git . + - rm -rf /mnt/cache/R-pkgs/00LOCK-r-pkg-binaries /mnt/cache/R-pkgs/00LOCK-bincraftR /opt/R/*/lib/R/library/RPostgres /mnt/cache/R-pkgs/00LOCK-RPostgres - rm -rf /mnt/cache/R-pkgs/RPostgres /mnt/cache/pkgcache/R/pkgcache - R -q -e 'options(Ncpus = 4, repos = structure(c(devxy = "https://cran.devxy.io/${ARCH}/${PKGS_ID}/latest", CRAN = "https://cloud.r-project.org"))); devtools::install(quiet = TRUE); packageVersion("bincraftR")' - mkdir -p /root/.R && /bin/bash -c 'echo -e "CXX_STD = CXX14\nCC=ccache gcc\nCPP=ccache gcc\nCXX=ccache g++\nCXX11=ccache g++\nCXX14=ccache g++\nCXX17=ccache g++\nF77=ccache /usr/bin/gfortran\nFC=ccache /usr/bin/gfortran" >> /root/.R/Makevars' diff --git a/.woodpecker/update-package-index.yaml b/.woodpecker/update-package-index.yaml index 1a426b7..52a4294 100644 --- a/.woodpecker/update-package-index.yaml +++ b/.woodpecker/update-package-index.yaml @@ -26,7 +26,7 @@ steps: commands: # download latest package version (avoid having to rebuild image every time) # rscript_startup arg: required to pass down global option to future workers https://github.com/HenrikBengtsson/future/issues/134#issuecomment-2245666169 - - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/arm64-r-binaries.git . + - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/r-pkg-binaries.git . - rm -rf /mnt/cache/packages/* - R -q -e 'devtools::install(); packageVersion("bincraftR")' - R -q -e 'pak::pak(c("pat-s/desc@description-from-remote", "pat-s/cranlike@s3"))'