fix tarball_arch
This commit is contained in:
parent
b436ae66c9
commit
fd20bbb3d1
3 changed files with 117 additions and 115 deletions
|
|
@ -9,66 +9,66 @@ depends_on:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- PLATFORM: redhat-9
|
- PLATFORM: redhat-9
|
||||||
BLOCK: 1634:length(pkgs)
|
BLOCK: 1719:length(pkgs)
|
||||||
ARCH: arm64
|
ARCH: arm64
|
||||||
NCPUS: 2
|
NCPUS: 2
|
||||||
MEMORY: 29Gi
|
MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
STRATEGY: multisession
|
||||||
- PLATFORM: redhat-8
|
# - PLATFORM: redhat-8
|
||||||
BLOCK: 1562:length(pkgs)
|
# BLOCK: 1562:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2404
|
# - PLATFORM: ubuntu-2404
|
||||||
BLOCK: 1705:length(pkgs)
|
# BLOCK: 1705:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2204
|
# - PLATFORM: ubuntu-2204
|
||||||
BLOCK: 1860:length(pkgs)
|
# BLOCK: 1860:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: alpine-320
|
# - PLATFORM: alpine-320
|
||||||
BLOCK: 1705:length(pkgs)
|
# BLOCK: 1705:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
### AMD
|
# ### AMD
|
||||||
- PLATFORM: redhat-9
|
# - PLATFORM: redhat-9
|
||||||
BLOCK: 982:length(pkgs)
|
# BLOCK: 982:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: redhat-8
|
# - PLATFORM: redhat-8
|
||||||
BLOCK: 561:length(pkgs)
|
# BLOCK: 561:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2404
|
# - PLATFORM: ubuntu-2404
|
||||||
BLOCK: 2067:length(pkgs)
|
# BLOCK: 2067:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2204
|
# - PLATFORM: ubuntu-2204
|
||||||
BLOCK: 2181:length(pkgs)
|
# BLOCK: 2181:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: alpine-320
|
# - PLATFORM: alpine-320
|
||||||
BLOCK: 1732:length(pkgs)
|
# BLOCK: 1732:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
steps:
|
steps:
|
||||||
- name: 'Build binaries (${PLATFORM}: ${BLOCK})'
|
- name: 'Build binaries (${PLATFORM}: ${BLOCK})'
|
||||||
secrets: [red_hat_dev_pw, aws_access_key_id, aws_secret_access_key, pgpass, git_ro_token, GITHUB_PAT]
|
secrets: [red_hat_dev_pw, aws_access_key_id, aws_secret_access_key, pgpass, git_ro_token, GITHUB_PAT]
|
||||||
|
|
|
||||||
|
|
@ -11,61 +11,61 @@ matrix:
|
||||||
NCPUS: 2
|
NCPUS: 2
|
||||||
MEMORY: 29Gi
|
MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
STRATEGY: multisession
|
||||||
- PLATFORM: redhat-8
|
# - PLATFORM: redhat-8
|
||||||
BLOCK: 1098:length(pkgs)
|
# BLOCK: 1098:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2404
|
# - PLATFORM: ubuntu-2404
|
||||||
BLOCK: 1248:length(pkgs)
|
# BLOCK: 1248:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2204
|
# - PLATFORM: ubuntu-2204
|
||||||
BLOCK: 1325:length(pkgs)
|
# BLOCK: 1325:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: alpine-320
|
# - PLATFORM: alpine-320
|
||||||
BLOCK: 1199:length(pkgs)
|
# BLOCK: 1199:length(pkgs)
|
||||||
ARCH: arm64
|
# ARCH: arm64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
### AMD
|
# ### AMD
|
||||||
- PLATFORM: redhat-9
|
# - PLATFORM: redhat-9
|
||||||
BLOCK: 690:length(pkgs)
|
# BLOCK: 690:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: redhat-8
|
# - PLATFORM: redhat-8
|
||||||
BLOCK: 224:length(pkgs)
|
# BLOCK: 224:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2404
|
# - PLATFORM: ubuntu-2404
|
||||||
BLOCK: 1481:length(pkgs)
|
# BLOCK: 1481:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: ubuntu-2204
|
# - PLATFORM: ubuntu-2204
|
||||||
BLOCK: 1542:length(pkgs)
|
# BLOCK: 1542:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
- PLATFORM: alpine-320
|
# - PLATFORM: alpine-320
|
||||||
BLOCK: 1161:length(pkgs)
|
# BLOCK: 1161:length(pkgs)
|
||||||
ARCH: amd64
|
# ARCH: amd64
|
||||||
NCPUS: 2
|
# NCPUS: 2
|
||||||
MEMORY: 29Gi
|
# MEMORY: 29Gi
|
||||||
STRATEGY: multisession
|
# STRATEGY: multisession
|
||||||
steps:
|
steps:
|
||||||
- name: 'Warming up'
|
- name: 'Warming up'
|
||||||
image: busybox:latest
|
image: busybox:latest
|
||||||
|
|
|
||||||
|
|
@ -243,23 +243,25 @@ build_single_tag <- function(
|
||||||
local_arch <- Sys.info()[["machine"]]
|
local_arch <- Sys.info()[["machine"]]
|
||||||
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
|
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
|
||||||
tarball_id <- "unknown"
|
tarball_id <- "unknown"
|
||||||
|
tarball_arch <- "aarch64"
|
||||||
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
|
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
|
||||||
tarball_id <- "pc"
|
tarball_id <- "pc"
|
||||||
|
tarball_arch <- "x86_64"
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!file.exists(sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag))) {
|
if (!file.exists(sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag))) {
|
||||||
if (debug) {
|
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)
|
# 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
|
# remove _aarch64-unknown-linux-gnu/musl part in filename
|
||||||
fs::file_move(
|
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)
|
sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag)
|
||||||
)
|
)
|
||||||
} else {
|
} 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) {
|
if (debug) {
|
||||||
message(sprintf("DEBUG: Listing dir 'dir_out_bin': %s", dir_out_bin))
|
message(sprintf("DEBUG: Listing dir 'dir_out_bin': %s", dir_out_bin))
|
||||||
message(fs::dir_ls(dir_out_bin))
|
message(fs::dir_ls(dir_out_bin))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue