Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable ARM64 docker builds #5

Merged
merged 2 commits into from
Jan 30, 2025
+5 −8
Merged

Enable ARM64 docker builds #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f77959
Add arm to the matrix
jeroen Jan 17, 2025
8732e64
Only set arm64
jeroen Jan 30, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 1 addition & 5 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down