From fdcff516b331aabee2317f0b6c3eb13842e61985 Mon Sep 17 00:00:00 2001 From: pat-s Date: Fri, 30 Aug 2024 10:12:51 +0200 Subject: [PATCH] require s3fs >= 0.1.7 --- .woodpecker/build.yaml | 1 - .woodpecker/process_cran_updates.yaml | 1 - .woodpecker/update-package-index.yaml | 2 +- DESCRIPTION | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index b9a4c82..ce93553 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -37,7 +37,6 @@ steps: - rm -rf /mnt/cache/R-pkgs/00LOCK-arm64-r-binaries /mnt/cache/R-pkgs/00LOCK-rBinaries # 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 'pak::pak("dyfanjones/s3fs")' - R -q -e 'devtools::install(); packageVersion("rBinaries")' - 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 diff --git a/.woodpecker/process_cran_updates.yaml b/.woodpecker/process_cran_updates.yaml index 836d9ed..7fdd561 100644 --- a/.woodpecker/process_cran_updates.yaml +++ b/.woodpecker/process_cran_updates.yaml @@ -32,7 +32,6 @@ steps: - rm -rf /mnt/cache/R-pkgs/00LOCK-arm64-r-binaries /mnt/cache/R-pkgs/00LOCK-rBinaries # 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 'pak::pak("dyfanjones/s3fs")' - R -q -e 'devtools::install(); packageVersion("rBinaries")' - 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 diff --git a/.woodpecker/update-package-index.yaml b/.woodpecker/update-package-index.yaml index f59fd15..955dc8d 100644 --- a/.woodpecker/update-package-index.yaml +++ b/.woodpecker/update-package-index.yaml @@ -29,7 +29,7 @@ steps: - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/arm64-r-binaries.git . - rm -rf /mnt/cache/packages/* - R -q -e 'devtools::install(); packageVersion("rBinaries")' - - R -q -e 'pak::pak(c("dyfanjones/s3fs", "pat-s/desc@description-from-remote", "pat-s/cranlike@s3"))' + - R -q -e 'pak::pak(c("pat-s/desc@description-from-remote", "pat-s/cranlike@s3"))' - cd /mnt/cache/packages - R -q -e 'options(crayon.enabled = TRUE); library(rBinaries); future::plan("multisession", workers = 4); library(progressr); handlers(global = TRUE); handlers("progress"); upload_package_index()' backend_options: diff --git a/DESCRIPTION b/DESCRIPTION index d1bb770..135e251 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,7 +19,7 @@ Imports: progressr, purrr, RPostgres, - s3fs, + s3fs (>= 0.1.7), xml2 Suggests: dbplyr