Skip to content

Commit 6107c08

Browse files
committed
Add Ubuntu 26.04
1 parent 9d99296 commit 6107c08

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
distro: [ 'amazon', 'centos-7', 'rocky-8', 'rocky-9', 'rocky-10', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'debian-10', 'debian-11', 'debian-12', 'debian-13', 'debian-14', 'debian-sid', 'opensuse', 'ubuntu-devel']
23+
distro: [ 'amazon', 'centos-7', 'rocky-8', 'rocky-9', 'rocky-10', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-26.04', 'debian-10', 'debian-11', 'debian-12', 'debian-13', 'debian-14', 'debian-sid', 'opensuse', 'ubuntu-devel']
2424
arch: [ 'amd64', 'arm64' ]
2525
steps:
2626
- name: Set up QEMU
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
distro: [ 'amazon', 'centos-7', 'rocky-8', 'rocky-9', 'rocky-10', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'debian-10', 'debian-11', 'debian-12', 'debian-13', 'debian-14', 'debian-sid', 'opensuse', 'ubuntu-devel']
57+
distro: [ 'amazon', 'centos-7', 'rocky-8', 'rocky-9', 'rocky-10', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-26.04', 'debian-10', 'debian-11', 'debian-12', 'debian-13', 'debian-14', 'debian-sid', 'opensuse', 'ubuntu-devel']
5858
needs: [build]
5959
steps:
6060
- name: Free some disk space

ubuntu-24.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt -yq update &&\
66
apt -yq dist-upgrade &&\
77
apt -yq install lsb-release apt-transport-https ca-certificates
88

9-
RUN echo "deb [trusted=yes] https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -sc)-cran40/" > /etc/apt/sources.list.d/cran.list && \
9+
RUN echo "deb [trusted=yes] https://ppa.launchpadcontent.net/cran/r-4.6/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/cran.list && \
1010
apt -yq update &&\
1111
apt -yq dist-upgrade &&\
1212
apt -yq install language-pack-en-base cloc curl parallel vim wget r-base-dev &&\

ubuntu-26.04/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:resolute
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
RUN apt -yq update &&\
6+
apt -yq dist-upgrade &&\
7+
apt -yq install lsb-release apt-transport-https ca-certificates
8+
9+
RUN echo "deb [trusted=yes] https://ppa.launchpadcontent.net/cran/r-4.6/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/cran.list && \
10+
apt -yq update &&\
11+
apt -yq dist-upgrade &&\
12+
apt -yq install language-pack-en-base cloc curl parallel vim wget r-base-dev &&\
13+
apt clean
14+
15+
ENV LC_ALL=en_US.UTF-8
16+
ENV LANG=en_US.UTF-8
17+
18+
COPY Renviron /etc/R/Renviron.site

0 commit comments

Comments
 (0)