From 156d05a6367e3ebf02c6e2c0677fd9d37c62e54b Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Fri, 6 Sep 2024 11:06:01 +0200
Subject: [PATCH] arch

---
 .woodpecker/process_cran_updates.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.woodpecker/process_cran_updates.yaml b/.woodpecker/process_cran_updates.yaml
index d7ca986..7d737a6 100644
--- a/.woodpecker/process_cran_updates.yaml
+++ b/.woodpecker/process_cran_updates.yaml
@@ -28,7 +28,7 @@ matrix:
 steps:
   - name: 'Processing Updates: (${PLATFORM})'
     secrets: [red_hat_dev_pw, aws_access_key_id, aws_secret_access_key, pgpass, git_ro_token, GITHUB_PAT]
-    image: docker.io/devxygmbh/arm64-binaries-r-${PLATFORM}
+    image: docker.io/devxygmbh/${ARCH}-binaries-r-${PLATFORM}
     pull: true
     # to ensure the PACKAGES upload step is being executed
     failure: ignore
@@ -39,13 +39,13 @@ steps:
       R_LIBS_USER: /mnt/cache/R-pkgs
       CCACHE_DIR: /mnt/cache/ccache
     volumes:
-      - arm64-binaries-r-dep-cache-${PLATFORM}:/mnt/cache
+      - ${ARCH}-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/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")'
+      - 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'
       - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
       # set additional repos: important as otherwise some packages cannot be resolved (e.g. INLA). Also: setting our own binary repos so we can make use of them for dep installation at some point
@@ -70,7 +70,7 @@ steps:
         #     memory: 4Gi
         #     cpu: 2000m
         nodeSelector:
-          kubernetes.io/arch: 'arm64'
+          kubernetes.io/arch: '${ARCH}'
         tolerations:
           - key: 'CI'
             operator: 'Equal'