Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/r-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04${{ matrix.platforms == 'linux/arm64' && '-arm' || '' }}
strategy:
fail-fast: true
matrix:
Expand All @@ -28,6 +28,10 @@ jobs:
- "latest"
platforms:
- linux/amd64
- linux/arm64
exclude:
- tag: "devel"
platforms: linux/arm64
steps:
- uses: actions/checkout@v5
- name: Set up Docker Buildx
Expand Down Expand Up @@ -61,7 +65,7 @@ jobs:

regression-test:
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04${{ matrix.platforms == 'linux/arm64' && '-arm' || '' }}
strategy:
fail-fast: false
matrix:
Expand All @@ -75,6 +79,13 @@ jobs:
- install_verse.sh
- install_shiny_server.sh
- install_geospatial.sh
include:
- platforms: linux/arm64
tag: "latest"
script: install_rstudio.sh
- platforms: linux/arm64
tag: "latest"
script: install_tidyverse.sh
steps:
- uses: actions/checkout@v5
- name: Set up Docker Buildx
Expand Down
3 changes: 2 additions & 1 deletion bakefiles/4.5.0.docker-bake.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
"org.opencontainers.image.authors": "Carl Boettiger <cboettig@ropensci.org>"
},
"platforms": [
"linux/amd64"
"linux/amd64",
"linux/arm64"
],
"cache-to": [
"type=inline"
Expand Down
3 changes: 2 additions & 1 deletion bakefiles/4.5.1.docker-bake.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@
"org.opencontainers.image.authors": "Carl Boettiger <cboettig@ropensci.org>"
},
"platforms": [
"linux/amd64"
"linux/amd64",
"linux/arm64"
],
"cache-to": [
"type=inline"
Expand Down
2 changes: 1 addition & 1 deletion build/templates/bakefiles/main.docker-bake.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"org.opencontainers.image.base.name": "docker.io/library/ubuntu:{{ubuntu_series}}",
"org.opencontainers.image.version": "R-{{r_version}}"
},
"platforms": ["linux/amd64"],
"platforms": ["linux/amd64", "linux/arm64"],
"cache-to": ["type=inline"]
},
"verse": {
Expand Down
5 changes: 0 additions & 5 deletions scripts/setup_R.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ function apt_install() {
## mechanism to force source installs if we're using RSPM
CRAN_SOURCE=${CRAN/"__linux__/${UBUNTU_CODENAME}/"/""}

## source install if using RSPM and arm64 image
if [ "$ARCH" = "aarch64" ]; then
CRAN=$CRAN_SOURCE
fi

## Add a default CRAN mirror
echo "options(repos = c(CRAN = '${CRAN}'), download.file.method = 'libcurl')" >>"${R_HOME}/etc/Rprofile.site"

Expand Down
Loading