diff --git a/.woodpecker/process-updates-redhat-8-amd64.yaml b/.woodpecker/process-updates-redhat-8-amd64.yaml index b4cabf0..8eafd38 100644 --- a/.woodpecker/process-updates-redhat-8-amd64.yaml +++ b/.woodpecker/process-updates-redhat-8-amd64.yaml @@ -41,6 +41,7 @@ steps: commands: - git clone https://pat-s:$$GIT_RO_TOKEN@git.devxy.io/devxy/build-binaries.git . - rm -rf /mnt/cache/R-pkgs/00LOCK-r-pkg-binaries /mnt/cache/R-pkgs/00LOCK-bincraftR /mnt/cache/R-pkgs/00LOCK-pak /mnt/cache/pkgcache/R/pkgcache /mnt/cache/R-pkgs/pkgcache /mnt/cache/R-pkgs/00LOCK-pak/mnt/cache/R-pkgs/00LOCK-RPostgres + - rm -rf /mnt/cache/R-pkgs/gert /mnt/cache/R-pkgs/git2r /mnt/cache/R-pkgs/pkgbuild /mnt/cache/R-pkgs/processx /mnt/cache/R-pkgs/curl - R -q -e 'pak::pak("git::https://gitlab.com/devxy/r-package-binaries/bincraftr.git")' - R -q -e 'packageVersion("bincraftR")' - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages diff --git a/.woodpecker/process-updates-redhat-8-arm64.yaml b/.woodpecker/process-updates-redhat-8-arm64.yaml index a972071..4a9ee48 100644 --- a/.woodpecker/process-updates-redhat-8-arm64.yaml +++ b/.woodpecker/process-updates-redhat-8-arm64.yaml @@ -40,6 +40,7 @@ steps: commands: - git clone https://pat-s:$$GIT_RO_TOKEN@git.devxy.io/devxy/build-binaries.git . - rm -rf /mnt/cache/R-pkgs/00LOCK-r-pkg-binaries /mnt/cache/R-pkgs/00LOCK-bincraftR /mnt/cache/R-pkgs/00LOCK-pak /mnt/cache/pkgcache/R/pkgcache /mnt/cache/pkgcache/R/pkgcache /mnt/cache/R-pkgs/pkgcache /mnt/cache/R-pkgs/00LOCK-pak/mnt/cache/R-pkgs/00LOCK-RPostgres + - rm -rf /mnt/cache/R-pkgs/gert /mnt/cache/R-pkgs/git2r /mnt/cache/R-pkgs/pkgbuild /mnt/cache/R-pkgs/processx /mnt/cache/R-pkgs/curl - R -q -e 'pak::pak("git::https://gitlab.com/devxy/r-package-binaries/bincraftr.git")' - R -q -e 'packageVersion("bincraftR")' - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages diff --git a/.woodpecker/update-package-index-redhat-8-arm64.yaml b/.woodpecker/update-package-index-redhat-8-arm64.yaml index 8f81eb8..ab5dce0 100644 --- a/.woodpecker/update-package-index-redhat-8-arm64.yaml +++ b/.woodpecker/update-package-index-redhat-8-arm64.yaml @@ -33,6 +33,7 @@ steps: commands: - git clone https://pat-s:$$GIT_RO_TOKEN@git.devxy.io/devxy/build-binaries.git . - rm -rf /mnt/cache/packages/* + - rm -rf /mnt/cache/R-pkgs/gert /mnt/cache/R-pkgs/git2r /mnt/cache/R-pkgs/pkgbuild /mnt/cache/R-pkgs/processx /mnt/cache/R-pkgs/curl - R -q -e 'pak::pak("git::https://gitlab.com/devxy/r-package-binaries/bincraftr.git")' - R -q -e 'pak::pak("pat-s/cranlike@s3")' - R -q -e 'packageVersion("bincraftR")' diff --git a/docker/Containerfile-redhat-8 b/docker/Containerfile-redhat-8 index 56920f0..8d184c5 100644 --- a/docker/Containerfile-redhat-8 +++ b/docker/Containerfile-redhat-8 @@ -33,7 +33,7 @@ RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.n # ImageMagick-c++-devel ImageMagick-devel: boths are not auto-installed via pak sysreqs # mecab-devel: RcppMeCab -> no autodetection yet # libfftw3-dev: ravetools -> actually auto-detect but somehow doesn't work in container? -RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel postgresql-devel htop libgit2-devel libxml2-devel hiredis ccache cmake xorg-x11-server-Xvfb ImageMagick-c++-devel ImageMagick-devel xz pkg-config mecab-devel fftw-devel tk-devel automake readline-devel +RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel postgresql-devel htop libgit2_1.7-devel libxml2-devel hiredis ccache cmake xorg-x11-server-Xvfb ImageMagick-c++-devel ImageMagick-devel xz pkg-config mecab-devel fftw-devel tk-devel automake readline-devel ### CUSTOM DEPENDENCIES # These usually are not packaged in OS repositories and need to be installed from source @@ -59,6 +59,7 @@ RUN bash -c 'echo -e "PKG_SYSREQS = TRUE\nPKG_SYSREQS_VERBOSE = TRUE\nPKG_SYSREQ # these dirs will later be used by the CI with existing mounts RUN mkdir -p /mnt/cache/packages /mnt/cache/pkgcache /mnt/cache/R-pkgs +RUN R -q -e 'install.packages("gert", repos = "cloud.r-project.org")' RUN R -q -e 'pak::pak("git::https://gitlab.com/devxy/r-package-binaries/bincraftr.git", dependencies = TRUE)' CMD ["/bin/bash"] \ No newline at end of file