From 6c499afe1c049d73f658827b0e1ad7ba203e0dfa Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 18 Jun 2025 12:52:41 +0200 Subject: [PATCH] fix: use separate yamls for arm and amd --- ...ons.yaml => build-all-versions-amd64.yaml} | 15 ++- .crow/build-all-versions-arm64.yaml | 108 ++++++++++++++++++ .crow/build-all-versions-install-deps.yaml | 4 +- 3 files changed, 118 insertions(+), 9 deletions(-) rename .crow/{build-all-versions.yaml => build-all-versions-amd64.yaml} (89%) create mode 100644 .crow/build-all-versions-arm64.yaml diff --git a/.crow/build-all-versions.yaml b/.crow/build-all-versions-amd64.yaml similarity index 89% rename from .crow/build-all-versions.yaml rename to .crow/build-all-versions-amd64.yaml index dac8aa7..43ebe93 100644 --- a/.crow/build-all-versions.yaml +++ b/.crow/build-all-versions-amd64.yaml @@ -3,11 +3,10 @@ # OS (alpine) # OS_VERSION (3.22) # R_VERSION (4.5) -# woodpecker-cli pipeline create --var ARCH=amd64 --var OS=alpine --var OS_VERSION=3.22 --var R_VERSION=4.5 --var task=build-all --var K8S_INSTANCE_TYPE=AX42 --var DYNAMIC_BACKEND=kubernetes --branch=main --log-level=info 7 -# woodpecker-cli pipeline create --var ARCH=arm64 --var OS=alpine --var OS_VERSION=3.22 --var R_VERSION=4.5 --var task=build-all --var K8S_INSTANCE_TYPE=cax41 --var DYNAMIC_BACKEND=docker --branch=main --log-level=info 7 +# woodpecker-cli pipeline create --var ARCH=amd64 --var OS=alpine --var OS_VERSION=3.22 --var R_VERSION=4.5 --var task=build-all-amd64 --var K8S_INSTANCE_TYPE=AX42 --branch=main --log-level=info 7 when: - event: manual - evaluate: 'task == "build-all"' + evaluate: 'task == "build-all-amd64"' skip_clone: true @@ -33,19 +32,19 @@ matrix: BACKEND: kubernetes - SPLIT_INTO: 10 SPLIT_INDEX: 6 - BACKEND: $DYNAMIC_BACKEND + BACKEND: kubernetes - SPLIT_INTO: 10 SPLIT_INDEX: 7 - BACKEND: $DYNAMIC_BACKEND + BACKEND: kubernetes - SPLIT_INTO: 10 SPLIT_INDEX: 8 - BACKEND: $DYNAMIC_BACKEND + BACKEND: kubernetes - SPLIT_INTO: 10 SPLIT_INDEX: 9 - BACKEND: $DYNAMIC_BACKEND + BACKEND: kubernetes - SPLIT_INTO: 10 SPLIT_INDEX: 10 - BACKEND: $DYNAMIC_BACKEND + BACKEND: kubernetes depends_on: - build-all-versions-install-deps diff --git a/.crow/build-all-versions-arm64.yaml b/.crow/build-all-versions-arm64.yaml new file mode 100644 index 0000000..e2cf6fa --- /dev/null +++ b/.crow/build-all-versions-arm64.yaml @@ -0,0 +1,108 @@ +### Required extra vars +# ARCH (amd64) +# OS (alpine) +# OS_VERSION (3.22) +# R_VERSION (4.5) +# woodpecker-cli pipeline create --var ARCH=arm64 --var OS=alpine --var OS_VERSION=3.22 --var R_VERSION=4.5 --var task=build-all-arm64 --var K8S_INSTANCE_TYPE=cax41 --branch=main --log-level=info 7 +when: + - event: manual + evaluate: 'task == "build-all-arm64"' + +skip_clone: true + +labels: + backend: ${BACKEND} + +matrix: + include: + - SPLIT_INTO: 10 + SPLIT_INDEX: 1 + BACKEND: kubernetes + - SPLIT_INTO: 10 + SPLIT_INDEX: 2 + BACKEND: kubernetes + - SPLIT_INTO: 10 + SPLIT_INDEX: 3 + BACKEND: kubernetes + - SPLIT_INTO: 10 + SPLIT_INDEX: 4 + BACKEND: kubernetes + - SPLIT_INTO: 10 + SPLIT_INDEX: 5 + BACKEND: kubernetes + - SPLIT_INTO: 10 + SPLIT_INDEX: 6 + BACKEND: docker + - SPLIT_INTO: 10 + SPLIT_INDEX: 7 + BACKEND: docker + - SPLIT_INTO: 10 + SPLIT_INDEX: 8 + BACKEND: docker + - SPLIT_INTO: 10 + SPLIT_INDEX: 9 + BACKEND: docker + - SPLIT_INTO: 10 + SPLIT_INDEX: 10 + BACKEND: docker + +depends_on: + - build-all-versions-install-deps + +steps: + - name: 'Build binaries' + image: docker.io/devxygmbh/rpkgs-build-env-${OS}:${OS_VERSION}-${R_VERSION} + pull: true + environment: + RED_HAT_DEV_PW: + from_secret: RED_HAT_DEV_PW + HETZNER_S3_ACCESS_KEY_K3S: + from_secret: HETZNER_S3_ACCESS_KEY_K3S + HETZNER_S3_SECRET_KEY_K3S: + from_secret: HETZNER_S3_SECRET_KEY_K3S + PGPASS: + from_secret: PGPASS + GIT_RO_TOKEN: + from_secret: GIT_RO_TOKEN + GITHUB_PAT: + from_secret: GITHUB_PAT + # normal env vars + GIT_USER: pat-s + # set the location of the 'pkgcache' cache dir which persists the R package dependencies needed to install the packages themselves + R_PKG_CACHE_DIR: /mnt/cache/pkgcache + R_LIBS_USER: /mnt/cache/R-pkgs + CCACHE_DIR: /mnt/cache/ccache + NCPUS: 2 + volumes: + - ${ARCH}-binaries-r-dep-cache-${OS}-${OS_VERSION//./}:/mnt/cache + commands: + - git clone -q https://pat-s:$$GIT_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git . + - R -q -e 'packageVersion("bincraft")' + - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages + # Windows-only: 'RInno', 'KeyboardSimulator', 'R2PPT', 'RWinEdt', 'blatr', 'excel.link', 'spectrino', 'taskscheduleR', 'MDSGUI', 'BiplotGUI', 'R2wd', 'rFUSION', 'MediaNews', 'rFUSION', 'MediaNews' + - xvfb-run R -q -e "options(crayon.enabled = TRUE, Ncpus = $NCPUS, future.globals.onReference = NULL); pak::sysreqs_db_update(); source('local/packages-to-build.R'); sprintf('Total# of remaining packages:%s', length(pkgs)); pkgs <- split(pkgs, cut(seq_along(pkgs), $SPLIT_INTO, labels = F))[[$SPLIT_INDEX]]; sprintf('# of packages for this job:%s', length(pkgs)); pkgs = setdiff(pkgs, c('RInno', 'KeyboardSimulator', 'R2PPT', 'RWinEdt', 'blatr', 'excel.link', 'spectrino', 'taskscheduleR', 'MDSGUI', 'BiplotGUI', 'R2wd', 'rFUSION', 'MediaNews', 'doBy', 'IDPmisc', 'frailtypack', 'afex', 'FrF2', 'DoE.base', 'agricolae', 'doFuture', 'fscaret', 'PHYLOGR', 'seewave', 'pls', 'relaimpo', 'geepack', 'gggenes', 'NPCirc', 'repmis', 'PNDSIBGE', 'lidR', 'poismf', 'neonstore', 'MachineShop', 'mvst', 'MacBehaviour', 'mcmcderive', 'RGIFT', 'KnowBR', 'netmeta', 'spdep', 'sf', 'Rfast', 'compareGroups')); library(future); plan('multisession'); foo = lapply(pkgs, function(x) bincraft::build_binary_package(x, is_debug = FALSE, force = FALSE, s3_endpoint = 'https://hel1.your-objectstorage.com', s3_region = 'hel1', s3_bucket = 'devxy-r-package-binaries-hel1', s3_access_key_id = Sys.getenv('HETZNER_S3_ACCESS_KEY_K3S'), s3_secret_access_key = Sys.getenv('HETZNER_S3_SECRET_KEY_K3S'), metadata_db_host = 'r-binaries.devxy.io', metadata_db_name = 'build_metadata', metadata_db_table = 'single_builds', metadata_db_user = 'r_binaries', metadata_db_password = Sys.getenv('PGPASS'), metadata_db_sslmode = 'require', metadata_db_port = 15432, archive = TRUE, upload = TRUE, store_build_metadata = TRUE))" + backend_options: + docker: + resources: + requests: + memory: 5Gi + cpu: 1000m + limits: + memory: 20Gi + cpu: 2000m + kubernetes: + resources: + requests: + memory: 5Gi + cpu: 1000m + limits: + memory: 20Gi + cpu: 2000m + nodeSelector: + kubernetes.io/arch: ${ARCH} + node.kubernetes.io/instance-type: ${K8S_INSTANCE_TYPE} + tolerations: + - key: 'CI' + operator: 'Equal' + value: 'true' + effect: 'NoSchedule' diff --git a/.crow/build-all-versions-install-deps.yaml b/.crow/build-all-versions-install-deps.yaml index f77d89b..1a036f3 100644 --- a/.crow/build-all-versions-install-deps.yaml +++ b/.crow/build-all-versions-install-deps.yaml @@ -5,7 +5,9 @@ # R_VERSION (4.5) when: - event: manual - evaluate: 'task == "build-all"' + evaluate: 'task == "build-all-arm64"' + - event: manual + evaluate: 'task == "build-all-amd64"' skip_clone: true