Skip to content

Commit

Permalink
enable arm64 build for rocker/rstudio after RStudio IDE 2023.05.0 (#…
Browse files Browse the repository at this point in the history
…651)

Close #144

Currently the linux/arm64 platform version of RStudio IDE is not bundled
Quarto CLI, but bundling may begin after RStudio IDE 2023.05.0.
(rstudio/rstudio#12411, rstudio/rstudio#13127)

When the Quarto CLI bundle to the RStudio IDE is started, I think we can
start building arm64 version of `rocker/rstudio`.

This PR also includes a small refactoring to correspond to the recently
released purrr 1.0.0. (Close #595)
  • Loading branch information
eitsupi committed May 17, 2023
1 parent cbce894 commit d26d1c8
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions build/make-stacks.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ library(gert)
NULL
}

urls_try <- list(
urls_try <- tidyr::expand_grid(
date = dates_try,
distro_version_name = c(distro_version_name, fallback_distro),
type = c("binary")
) |>
purrr::cross() |>
purrr::map_chr(purrr::lift(.make_rspm_cran_url_linux)) |>
purrr::pmap_chr(.make_rspm_cran_url_linux) |>
unique()

for (i in seq_along(urls_try)) {
Expand Down Expand Up @@ -224,6 +223,14 @@ write_stack <- function(r_version,
r_latest
)
template$stack[[2]]$ENV$RSTUDIO_VERSION <- rstudio_version
template$stack[[2]]$platforms <-
# linux/arm64 platform version of RStudio IDE will bundle Quarto CLI after version 2023.05.0
# (https://github.com/rstudio/rstudio/issues/12411)
# We are postponing the build of the linux/arm64 version of rocker/rstudio until this version
# because we want to fix the version of Quarto CLI included in rocker/rstudio
if (numeric_version(stringr::str_replace_all(rstudio_version, r"(\+)", ".")) > "2023.05.0") {
list("linux/amd64", "linux/arm64")
}

# rocker/tidyverse
template$stack[[3]]$FROM <- stringr::str_c("rocker/rstudio:", r_version)
Expand Down

0 comments on commit d26d1c8

Please sign in to comment.