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

CI: add arm64 container #59

Merged
merged 2 commits into from
Feb 5, 2025
Merged

CI: add arm64 container #59

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
bb38fbb
CI: add arm64 container
junghans Feb 5, 2025
4f0391f
CI: install gcc-multilib only on amd64
junghans Feb 5, 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
34 changes: 31 additions & 3 deletions .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ jobs:
strategy:
matrix:
config:
- {dockerfile: 'fedora', tag: 'latest'}
- {dockerfile: 'fedora', tag: 'latest-amd64'}
- {dockerfile: 'fedora', tag: 'latest-arm64', arm: 'true'}
- {dockerfile: 'fedora', tag: 'rawhide', build_args: 'TAG=rawhide', continue-on-error: 'true'}
- {dockerfile: 'ubuntu', tag: 'latest'}
- {dockerfile: 'ubuntu', tag: 'latest-amd64'}
- {dockerfile: 'ubuntu', tag: 'latest-arm64', arm: 'true'}
- {dockerfile: 'ubuntu', tag: 'rolling', build_args: 'TAG=rolling'}
- {dockerfile: 'ubuntu', tag: 'devel', build_args: 'TAG=devel', continue-on-error: 'true'}
- {dockerfile: 'ubuntu', tag: 'intel', build_args: 'TAG=22.04,INTEL=yes', cmake_args: '-DCMAKE_CXX_COMPILER=icpx -DCMAKE_CXX_FLAGS=-fp-model=precise', continue-on-error: 'true'}
- {dockerfile: 'opensuse', tag: 'latest'}
continue-on-error: ${{ matrix.config.continue-on-error == 'true' }}
env:
docker-tag: ghcr.io/kokkos/ci-containers/${{ matrix.config.dockerfile }}:${{ matrix.config.tag }}
runs-on: ubuntu-latest
runs-on: ${{ matrix.config.arm == 'true' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down Expand Up @@ -87,3 +89,29 @@ jobs:
file: ${{ matrix.config.dockerfile }}
build-args: ${{ steps.build_args.outputs.args }}
push: true

merge-docker-manifest:
runs-on: ubuntu-latest
needs: CI
strategy:
matrix:
config:
- {dockerfile: 'fedora', tag: 'latest'}
- {dockerfile: 'ubuntu', tag: 'latest'}
env:
docker-tag: ghcr.io/kokkos/ci-containers/${{ matrix.config.dockerfile }}:${{ matrix.config.tag }}
steps:
- name: Login to Github Container Registry
if: github.repository_owner == 'kokkos' && ( github.event_name == 'push' || github.event_name == 'schedule' )
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Create and push manifest images to Github Container Registry
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not a 100% needed, but it is nice to have a kokkos/ci-containers/fedora:latest tag that is multiarch.

if: github.repository_owner == 'kokkos' && ( github.event_name == 'push' || github.event_name == 'schedule' )
uses: Noelware/docker-manifest-action@master
with:
inputs: ${{ env.docker-tag }}
images: ${{ env.docker-tag }}-amd64,${{ env.docker-tag }}-arm64
push: ${{ github.repository_owner == 'kokkos' && ( github.event_name == 'push' || github.event_name == 'schedule' ) }}
5 changes: 4 additions & 1 deletion ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
make git g++ gfortran ccache vim clang llvm wget sudo curl ninja-build clang-format zstd libhwloc-dev libomp-dev gnupg2 cmake libgtest-dev clang-tidy gcc-multilib g++-multilib gfortran-multilib && \
make git g++ gfortran ccache vim clang llvm wget sudo curl ninja-build clang-format zstd libhwloc-dev libomp-dev gnupg2 cmake libgtest-dev clang-tidy && \
if [ "$(uname -m)" = "x86_64" ]; then \
apt-get install -y gcc-multilib g++-multilib gfortran-multilib; \
fi && \
apt-get purge --autoremove -y && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -23,6 +26,6 @@
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER kokkos
ENV PATH=${INTEL:+/opt/intel/oneapi/compiler/latest/linux/bin:/opt/intel/oneapi/compiler/latest/linux/bin/intel64}${PATH:+:}${PATH}
ENV LD_LIBRARY_PATH=${INTEL:+/opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64:/opt/intel/oneapi/mkl/latest/lib/intel64}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}

Check warning on line 29 in ubuntu

View workflow job for this annotation

GitHub Actions / CI (ubuntu, latest-amd64)

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$LD_LIBRARY_PATH'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 29 in ubuntu

View workflow job for this annotation

GitHub Actions / CI (ubuntu, latest-arm64, true)

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$LD_LIBRARY_PATH'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 29 in ubuntu

View workflow job for this annotation

GitHub Actions / CI (ubuntu, rolling, TAG=rolling)

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$LD_LIBRARY_PATH'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 29 in ubuntu

View workflow job for this annotation

GitHub Actions / CI (ubuntu, devel, TAG=devel, true)

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$LD_LIBRARY_PATH'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 29 in ubuntu

View workflow job for this annotation

GitHub Actions / CI (ubuntu, intel, TAG=22.04,INTEL=yes, -DCMAKE_CXX_COMPILER=icpx -DCMAKE_CXX_FLAGS=-fp-model=pre...

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$LD_LIBRARY_PATH'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
ENV CCACHE_MAXSIZE=250M
WORKDIR /home/kokkos
Loading