Enable ARM64 docker builds (#5)

r-devel · Jan 30, 2025 · f0ec9ef · f0ec9ef
1 parent 5fb7874
commit f0ec9ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,11 +14,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.04${{matrix.arch=='arm' && '-arm' || ''}}
     strategy:
       fail-fast: false
       matrix:
         os: [ 'debian', 'ubuntu' ]
+        arch: [ 'intel', 'arm' ]
     steps:
       - name: Free some disk space
         run: rm -Rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"

diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -15,12 +15,8 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 
-## This seems broken right now in sid
-# RUN gpg --recv-keys 3B1C3B572302BCB1 && \
-#    gpg --armor --export 3B1C3B572302BCB1 | apt-key add -
-
 RUN \
-	echo "deb [trusted=yes] http://statmath.wu.ac.at/AASC/debian testing main non-free" > /etc/apt/sources.list.d/rcheckserver.list && \
+	echo "deb [trusted=yes arch=amd64] http://statmath.wu.ac.at/AASC/debian testing main non-free" > /etc/apt/sources.list.d/rcheckserver.list && \
 	apt-get -y update && \
 	DEBIAN_FRONTEND=noninteractive apt-get -yq install rcheckserver &&\
 	apt-get clean

diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
@@ -14,14 +14,14 @@ RUN \
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 
-RUN curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xfe6b0f6d941769e0b8ee7c3c3b1c3b572302bcb1" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+#RUN curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xfe6b0f6d941769e0b8ee7c3c3b1c3b572302bcb1" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
 
 # hack for broken lam4-dev
 RUN mkdir -p /usr/share/man/man3 && \
     touch /usr/share/man/man3/MPI_Comm_set_name_lam4-dev.3.gz
 
 # install rcheckserver
-RUN echo "deb http://statmath.wu.ac.at/AASC/debian testing main non-free" > /etc/apt/sources.list.d/rcheckserver.list && \
+RUN echo "deb [trusted=yes arch=amd64] http://statmath.wu.ac.at/AASC/debian testing main non-free" > /etc/apt/sources.list.d/rcheckserver.list && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -yq install rcheckserver &&\
     apt-get clean