From fd20bbb3d1836627fd1d9af05620eea98f3c6a6f Mon Sep 17 00:00:00 2001 From: pat-s Date: Tue, 24 Sep 2024 08:34:42 +0200 Subject: [PATCH] fix tarball_arch --- .woodpecker/build.yaml | 112 ++++++++++++++++----------------- .woodpecker/warm_up_build.yaml | 110 ++++++++++++++++---------------- R/build_binaries.R | 10 +-- 3 files changed, 117 insertions(+), 115 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index d17ecc9..dcef813 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -9,66 +9,66 @@ depends_on: matrix: include: - PLATFORM: redhat-9 - BLOCK: 1634:length(pkgs) + BLOCK: 1719:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi STRATEGY: multisession - - PLATFORM: redhat-8 - BLOCK: 1562:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2404 - BLOCK: 1705:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2204 - BLOCK: 1860:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: alpine-320 - BLOCK: 1705:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - ### AMD - - PLATFORM: redhat-9 - BLOCK: 982:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: redhat-8 - BLOCK: 561:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2404 - BLOCK: 2067:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2204 - BLOCK: 2181:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: alpine-320 - BLOCK: 1732:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession + # - PLATFORM: redhat-8 + # BLOCK: 1562:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2404 + # BLOCK: 1705:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2204 + # BLOCK: 1860:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: alpine-320 + # BLOCK: 1705:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # ### AMD + # - PLATFORM: redhat-9 + # BLOCK: 982:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: redhat-8 + # BLOCK: 561:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2404 + # BLOCK: 2067:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2204 + # BLOCK: 2181:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: alpine-320 + # BLOCK: 1732:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession steps: - name: 'Build binaries (${PLATFORM}: ${BLOCK})' secrets: [red_hat_dev_pw, aws_access_key_id, aws_secret_access_key, pgpass, git_ro_token, GITHUB_PAT] diff --git a/.woodpecker/warm_up_build.yaml b/.woodpecker/warm_up_build.yaml index 6c68e6c..8222572 100644 --- a/.woodpecker/warm_up_build.yaml +++ b/.woodpecker/warm_up_build.yaml @@ -11,61 +11,61 @@ matrix: NCPUS: 2 MEMORY: 29Gi STRATEGY: multisession - - PLATFORM: redhat-8 - BLOCK: 1098:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2404 - BLOCK: 1248:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2204 - BLOCK: 1325:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: alpine-320 - BLOCK: 1199:length(pkgs) - ARCH: arm64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - ### AMD - - PLATFORM: redhat-9 - BLOCK: 690:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: redhat-8 - BLOCK: 224:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2404 - BLOCK: 1481:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: ubuntu-2204 - BLOCK: 1542:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession - - PLATFORM: alpine-320 - BLOCK: 1161:length(pkgs) - ARCH: amd64 - NCPUS: 2 - MEMORY: 29Gi - STRATEGY: multisession + # - PLATFORM: redhat-8 + # BLOCK: 1098:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2404 + # BLOCK: 1248:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2204 + # BLOCK: 1325:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: alpine-320 + # BLOCK: 1199:length(pkgs) + # ARCH: arm64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # ### AMD + # - PLATFORM: redhat-9 + # BLOCK: 690:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: redhat-8 + # BLOCK: 224:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2404 + # BLOCK: 1481:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: ubuntu-2204 + # BLOCK: 1542:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession + # - PLATFORM: alpine-320 + # BLOCK: 1161:length(pkgs) + # ARCH: amd64 + # NCPUS: 2 + # MEMORY: 29Gi + # STRATEGY: multisession steps: - name: 'Warming up' image: busybox:latest diff --git a/R/build_binaries.R b/R/build_binaries.R index 3a87a55..0f6912f 100644 --- a/R/build_binaries.R +++ b/R/build_binaries.R @@ -243,23 +243,25 @@ build_single_tag <- function( local_arch <- Sys.info()[["machine"]] if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) { tarball_id <- "unknown" + tarball_arch <- "aarch64" } else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) { tarball_id <- "pc" + tarball_arch <- "x86_64" } if (!file.exists(sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag))) { if (debug) { - cli::cli_alert_info('{.fun build_single_tag}: DEBUG: Moving package from {.path {sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, arch, tarball_id, linux_suffix)}} to {.path {sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag)}}') + cli::cli_alert_info('{.fun build_single_tag}: DEBUG: Moving package from {.path {sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, tarball_arch, tarball_id, linux_suffix)}} to {.path {sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag)}}') } # double-check that file exists (some packages like https://github.com/cran/BACCO/tree/1.0-14 don't include R/ and hence don't procude a valid binary) - if (fs::file_exists(sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, arch, tarball_id, linux_suffix))) { + if (fs::file_exists(sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, tarball_arch, tarball_id, linux_suffix))) { # remove _aarch64-unknown-linux-gnu/musl part in filename fs::file_move( - sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, arch, tarball_id, linux_suffix), + sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, tarball_arch, tarball_id, linux_suffix), sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag) ) } else { - cli::cli_alert_info('{.fun build_single_tag}: File for package {.pkg {package_name}} {.field {tag}} at {.path {sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, arch, tarball_id, linux_suffix)}} does not exist - skipping.') + cli::cli_alert_info('{.fun build_single_tag}: File for package {.pkg {package_name}} {.field {tag}} at {.path {sprintf("%s/%s_%s_R_%s-%s-linux-%s.tar.gz", dir_out_bin, package_name, tag, tarball_arch, tarball_id, linux_suffix)}} does not exist - skipping.') if (debug) { message(sprintf("DEBUG: Listing dir 'dir_out_bin': %s", dir_out_bin)) message(fs::dir_ls(dir_out_bin))