From 83c761b73670461772615543776d145db5e34978 Mon Sep 17 00:00:00 2001 From: pat-s Date: Thu, 18 Jun 2026 11:39:11 +0000 Subject: [PATCH] feat(ci): OS/OS_VERSION manual dropdowns + restore lost crow fix (#97) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary Two changes: 1. **`OS`/`OS_VERSION` manual-run dropdowns** — give these form variables explicit `options:` lists (like `target_arch` and `R_VERSION`), so the manual-run form shows dropdowns instead of free-text, in both `build-all-versions.yaml` and `build-all-versions-install-deps.yaml`. Crow form variables are independent (no cascading), so the operator still has to pick a coherent `OS` + `OS_VERSION` combination (e.g. `redhat` + `9`, not `alpine` + `jammy`). 2. **Repairs `main`** — the crow fix from PR #96 (`bc2f6f1`) was lost when that PR was squashed (only the first commit was captured). As a result `main` currently carries the `OS: ${OS}` env vars that break Crow parsing (`unable to parse variable name`) and the unfixed `build-all.R`. This PR re-applies that fix: drop the env additions and derive `platform`/`arch` inside `build-all.R` from the container (bincraft codename → platform mapping + `Sys.info()` arch). ## Notes - `OS_VERSION` options are quoted strings so tags like `8`/`9`/`10` aren't parsed as integers. - Validated: both YAMLs parse, `build-all.R` parses. Reviewed-on: https://git.devxy.io/devxy/build-cran-binaries/pulls/97 --- .crow/build-all-versions-install-deps.yaml | 15 ++++++++++-- .crow/build-all-versions.yaml | 22 ++++++++++-------- local/build-all.R | 27 ++++++++++++++++++++-- 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/.crow/build-all-versions-install-deps.yaml b/.crow/build-all-versions-install-deps.yaml index 97610df..1c2df64 100644 --- a/.crow/build-all-versions-install-deps.yaml +++ b/.crow/build-all-versions-install-deps.yaml @@ -10,10 +10,21 @@ variables: - arm64 default: amd64 OS: - description: "Base OS image name (e.g. alpine, redhat, ubuntu)." + description: "Base OS image name." + options: + - alpine + - redhat + - ubuntu default: alpine OS_VERSION: - description: "OS version / image tag (e.g. 3.24, 9, jammy, noble)." + description: "OS image tag. Must match OS (alpine: 3.24; redhat: 8/9/10; ubuntu: jammy/noble)." + options: + - "3.24" + - "8" + - "9" + - "10" + - "jammy" + - "noble" default: "3.24" R_VERSION: description: "Primary R version under /opt/R." diff --git a/.crow/build-all-versions.yaml b/.crow/build-all-versions.yaml index b2ede89..ed392fd 100644 --- a/.crow/build-all-versions.yaml +++ b/.crow/build-all-versions.yaml @@ -11,10 +11,21 @@ variables: - arm64 default: amd64 OS: - description: "Base OS image name (e.g. alpine, redhat, ubuntu)." + description: "Base OS image name." + options: + - alpine + - redhat + - ubuntu default: alpine OS_VERSION: - description: "OS version / image tag (e.g. 3.24, 9, jammy, noble)." + description: "OS image tag. Must match OS (alpine: 3.24; redhat: 8/9/10; ubuntu: jammy/noble)." + options: + - "3.24" + - "8" + - "9" + - "10" + - "jammy" + - "noble" default: "3.24" R_VERSION: description: "Primary R version under /opt/R." @@ -90,13 +101,6 @@ steps: from_secret: GITHUB_PAT # normal env vars GIT_USER: pat-s - # Export the platform selectors as runtime env vars. They are otherwise - # only available for ${...} interpolation (image/volume), so build-all.R's - # `Sys.getenv("OS")/("OS_VERSION")/("ARCH")` would be empty and its - # already-built dedup query would match platform "-" and skip nothing. - OS: ${OS} - OS_VERSION: ${OS_VERSION} - ARCH: ${ARCH} # set the location of the 'pkgcache' cache dir which persists the R package dependencies needed to install the packages themselves R_PKG_CACHE_DIR: ${R_PKG_CACHE_DIR} R_LIBS_USER: /mnt/cache/R-pkgs diff --git a/local/build-all.R b/local/build-all.R index f8e8efd..6c3725c 100644 --- a/local/build-all.R +++ b/local/build-all.R @@ -68,8 +68,31 @@ chunk <- chunk[!chunk$Package %in% exclude, ] # pkgs_to_build.rds is a static snapshot from the install-deps step, so on a # restart it still lists everything an interrupted run already produced. The # metadata DB reflects that progress, so we re-derive the remaining set here. -platform <- paste(Sys.getenv("OS"), gsub("[.]", "", Sys.getenv("OS_VERSION")), sep = "-") -arch <- Sys.getenv("ARCH") +# Derive platform + arch from the running container, mirroring the codename -> +# platform mapping bincraft uses internally. The OS/OS_VERSION selectors are +# workflow-level CI variables that are not injected into the container +# environment, so Sys.getenv() would return "" and this pre-filter would query +# platform "-" and skip nothing. +codename <- bincraft::set_codename(NULL) +platform <- switch( + codename, + jammy = "ubuntu-2204", + noble = "ubuntu-2404", + resolute = "ubuntu-2604", + rhel10 = "redhat-10", + rhel9 = "redhat-9", + rhel8 = "redhat-8", + alpine320 = "alpine-320", + alpine321 = "alpine-321", + alpine322 = "alpine-322", + alpine323 = "alpine-323", + alpine324 = "alpine-324", + alpine325 = "alpine-325", + alpine326 = "alpine-326", + NA_character_ +) +local_machine <- Sys.info()[["machine"]] +arch <- if (grepl("arm64|aarch64", local_machine)) "arm64" else "amd64" con <- DBI::dbConnect( RPostgres::Postgres(), dbname = "build_metadata",