From 6896a844cff8e61249e15e3895729eb15a80dc04 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sat, 2 Nov 2024 20:02:55 +0100 Subject: [PATCH] build --- .../process-updates-alpine-320-arm64.yaml | 2 +- .../process-updates-redhat-8-arm64.yaml | 15 +++---- .../process-updates-redhat-9-arm64.yaml | 15 +++---- .woodpecker/update-package-index.yaml | 41 ++++++++++--------- 4 files changed, 32 insertions(+), 41 deletions(-) diff --git a/.woodpecker/process-updates-alpine-320-arm64.yaml b/.woodpecker/process-updates-alpine-320-arm64.yaml index 1d2aee7..1674920 100644 --- a/.woodpecker/process-updates-alpine-320-arm64.yaml +++ b/.woodpecker/process-updates-alpine-320-arm64.yaml @@ -49,7 +49,7 @@ steps: MEMORY: 14Gi STRATEGY: sequential INSTANCE_TYPE: cax31 - INTERVAL: lubridate::interval(lubridate::today() - 3, lubridate::today() - 40) + INTERVAL: lubridate::interval(lubridate::today() - 3, lubridate::today() - 3) volumes: - arm64-binaries-r-dep-cache-alpine-320:/mnt/cache commands: diff --git a/.woodpecker/process-updates-redhat-8-arm64.yaml b/.woodpecker/process-updates-redhat-8-arm64.yaml index cea0fcd..cf5f4bb 100644 --- a/.woodpecker/process-updates-redhat-8-arm64.yaml +++ b/.woodpecker/process-updates-redhat-8-arm64.yaml @@ -1,6 +1,6 @@ when: - event: [cron] - cron: process-cran-updates + cron: process-cran-updates-redhat-8-arm64 - event: manual evaluate: 'process_cran_updates == "all"' - event: manual @@ -12,13 +12,8 @@ steps: - name: 'Warming up' image: busybox:latest failure: ignore - environment: - PLATFORM: ubuntu-2204 - BLOCK: 21389:length(pkgs) - NCPUS: 2 - STRATEGY: sequential commands: - - sleep 1 + - sleep 300 - echo "Warmed Up" backend_options: kubernetes: @@ -40,7 +35,7 @@ steps: - name: 'Processing Updates' 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/arm64-binaries-r-redhat-8 pull: true environment: GIT_USER: pat-s @@ -54,9 +49,9 @@ steps: MEMORY: 14Gi STRATEGY: sequential INSTANCE_TYPE: cax31 - INTERVAL: lubridate::interval(lubridate::today() - 3, lubridate::today() - 31) + INTERVAL: lubridate::interval(lubridate::today() - 3, lubridate::today() - 40) volumes: - - arm64-binaries-r-dep-cache-${PLATFORM}:/mnt/cache + - arm64-binaries-r-dep-cache-redhat-8:/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 . diff --git a/.woodpecker/process-updates-redhat-9-arm64.yaml b/.woodpecker/process-updates-redhat-9-arm64.yaml index 9b3cf3b..3d2a849 100644 --- a/.woodpecker/process-updates-redhat-9-arm64.yaml +++ b/.woodpecker/process-updates-redhat-9-arm64.yaml @@ -1,6 +1,6 @@ when: - event: [cron] - cron: process-cran-updates + cron: process-cran-updates-redhat-9-arm64 - event: manual evaluate: 'process_cran_updates == "all"' - event: manual @@ -12,13 +12,8 @@ steps: - name: 'Warming up' image: busybox:latest failure: ignore - environment: - PLATFORM: ubuntu-2204 - BLOCK: 21389:length(pkgs) - NCPUS: 2 - STRATEGY: sequential commands: - - sleep 1 + - sleep 300 - echo "Warmed Up" backend_options: kubernetes: @@ -40,7 +35,7 @@ steps: - name: 'Processing Updates' 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/arm64-binaries-r-redhat-9 pull: true environment: GIT_USER: pat-s @@ -54,9 +49,9 @@ steps: MEMORY: 14Gi STRATEGY: sequential INSTANCE_TYPE: cax31 - INTERVAL: lubridate::interval(lubridate::today() - 3, lubridate::today() - 31) + INTERVAL: lubridate::interval(lubridate::today() - 3, lubridate::today() - 3) volumes: - - arm64-binaries-r-dep-cache-${PLATFORM}:/mnt/cache + - arm64-binaries-r-dep-cache-redhat-9:/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 . diff --git a/.woodpecker/update-package-index.yaml b/.woodpecker/update-package-index.yaml index 246e4bf..7d7c502 100644 --- a/.woodpecker/update-package-index.yaml +++ b/.woodpecker/update-package-index.yaml @@ -8,26 +8,26 @@ skip_clone: true matrix: include: - # - PLATFORM: redhat-9 - # ARCH: arm64 + - PLATFORM: redhat-9 + ARCH: arm64 # - PLATFORM: redhat-8 # ARCH: arm64 - # - PLATFORM: ubuntu-2404 - # ARCH: arm64 - # - PLATFORM: ubuntu-2204 - # ARCH: arm64 - # - PLATFORM: alpine-320 - # ARCH: arm64 - # - PLATFORM: redhat-9 - # ARCH: amd64 - # - PLATFORM: redhat-8 - # ARCH: amd64 + - PLATFORM: ubuntu-2404 + ARCH: arm64 + - PLATFORM: ubuntu-2204 + ARCH: arm64 + - PLATFORM: alpine-320 + ARCH: arm64 + - PLATFORM: redhat-9 + ARCH: amd64 + - PLATFORM: redhat-8 + ARCH: amd64 - PLATFORM: ubuntu-2404 ARCH: amd64 - # - PLATFORM: ubuntu-2204 - # ARCH: amd64 - # - PLATFORM: alpine-320 - # ARCH: amd64 + - PLATFORM: ubuntu-2204 + ARCH: amd64 + - PLATFORM: alpine-320 + ARCH: amd64 steps: - name: Upload PACKAGES files secrets: [red_hat_dev_pw, aws_access_key_id, aws_secret_access_key, pgpass, git_ro_token, GITHUB_PAT] @@ -45,19 +45,20 @@ steps: # 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/r-pkg-binaries.git . - rm -rf /mnt/cache/packages/* + - rm -rf /mnt/cache/R-pkgs/stringr - R CMD INSTALL . - 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(bincraftR); future::plan("multisession", workers = 4); library(progressr); handlers(global = TRUE); handlers("progress"); upload_package_index()' + - R -q -e 'options(crayon.enabled = TRUE); library(bincraftR); future::plan("multisession", workers = 2); library(progressr); handlers(global = TRUE); handlers("progress"); upload_package_index()' backend_options: kubernetes: resources: requests: - memory: 5000Mi + memory: 2000Mi cpu: 2000m limits: - memory: 15000Mi - cpu: 4000m + memory: 2000Mi + cpu: 2000m nodeSelector: kubernetes.io/arch: '${ARCH}'