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.

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

Update packages and the base image #1

Merged
merged 73 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
409a729
Update yum sources
alephpiece Apr 4, 2024
3739706
Remove rocm and spack mirror create commands for now
alephpiece Apr 4, 2024
6270902
Update spack package.py
alephpiece Apr 4, 2024
a7c3a58
Update spack install commands
alephpiece Apr 4, 2024
64340bb
Add rocm
alephpiece Apr 4, 2024
0a4b517
Remove stage 2
alephpiece Apr 4, 2024
11a6176
Update dependency buinding order
alephpiece Apr 4, 2024
08abb56
Change apt sources to BFSU mirrors
alephpiece Apr 4, 2024
5d1212e
Add back spack mirror commands
alephpiece Apr 4, 2024
7f959b2
Update spack mirror commands
alephpiece Apr 4, 2024
806c228
Update antmoc package
alephpiece Apr 4, 2024
e050958
Add some scripts for slimtoolkit
alephpiece Apr 4, 2024
8bdf5e6
Fix antmoc package
alephpiece Apr 4, 2024
bf50deb
Update build-antmoc.sh
alephpiece Apr 4, 2024
5c05bb7
Add -j to spack install
alephpiece Apr 4, 2024
40fcaf0
Update system version to ubuntu-jammy
alephpiece Apr 5, 2024
e3b0063
Failed to install ROCm-dev on Ubuntu jammy, rolling back
alephpiece Apr 5, 2024
dd561f0
Migrate some system packages to spack
alephpiece Apr 5, 2024
613fe23
Update github actions
alephpiece Apr 5, 2024
d2e07e7
Specify cmake version
alephpiece Apr 5, 2024
4064749
Remove cmake from spack install
alephpiece Apr 5, 2024
a1a217c
Add system packages back
alephpiece Apr 5, 2024
a1f5c54
Fix cmake package
alephpiece Apr 5, 2024
30c8e5d
Remove curl from spack external
alephpiece Apr 5, 2024
8bad0ca
Update system version to jammy
alephpiece Apr 5, 2024
e925093
Update googletest version
alephpiece Apr 5, 2024
2df3a98
Add rocthrust back
alephpiece Apr 5, 2024
696f3fe
Split apt install commands
alephpiece Apr 5, 2024
02d99fa
Update comments
alephpiece Apr 5, 2024
9149cde
Add tests
alephpiece Apr 5, 2024
e74774b
Update build-antmoc.sh
alephpiece Apr 5, 2024
cd336a8
Update build-antmoc.sh
alephpiece Apr 5, 2024
b951370
Add python to spack external, update hdf5
alephpiece Apr 5, 2024
8aa2f22
Update build-antmoc.sh for testing
alephpiece Apr 5, 2024
8ddc6f9
Update mpi versions
alephpiece Apr 5, 2024
9fd0b1c
Roll back mpi versions
alephpiece Apr 5, 2024
4d7ca1b
Update entrypoint and cmd
alephpiece Apr 6, 2024
707831d
Add a parameter to docker-slim.sh
alephpiece Apr 6, 2024
808bd97
Fix docker-slim.sh parameters
alephpiece Apr 6, 2024
4e190f4
Update MPI versions
alephpiece Apr 6, 2024
4c6fc5d
Remove setup-env.sh
alephpiece Apr 6, 2024
271bd68
Update scripts
alephpiece Apr 6, 2024
e91b2b1
SImplify spack specs in Dockerfile
alephpiece Apr 6, 2024
56495e7
Update spack package versions
alephpiece Apr 6, 2024
715b6bf
Update spack specs
alephpiece Apr 6, 2024
8423a7e
Fix build-antmoc.sh
alephpiece Apr 6, 2024
bf4ecc3
Use heredoc, use AMD clang instead of the clang shipped with Ubuntu
alephpiece Apr 6, 2024
1009588
Use spack to get ubuntu version
alephpiece Apr 6, 2024
740d3ef
Minor fix
alephpiece Apr 7, 2024
6f5900a
Fix missing compilers in the system spack config file
alephpiece Apr 7, 2024
822e19a
Update dependency versions
alephpiece Apr 8, 2024
a9e4ab2
Fix googletest variant pthreads
alephpiece Apr 9, 2024
d669bf0
Update package
alephpiece Apr 9, 2024
ca0a849
Update dependencies
alephpiece Apr 9, 2024
f70e74c
Add a simplified dockerfile without rocm
alephpiece Apr 9, 2024
445daf4
Try to fix the entrypoint for GitLab CI
alephpiece Apr 9, 2024
be445f0
Change entrypoint
alephpiece Apr 9, 2024
a6031e1
Use spack environments to build docker images
alephpiece Apr 10, 2024
6de31d6
Generate tests with a python script
alephpiece Apr 10, 2024
bc6d3ec
Add a set-up script to the image
alephpiece Apr 10, 2024
8e6ab84
Add tag to slimmed image
alephpiece Apr 10, 2024
a1da9d2
Update docker-slim.sh
alephpiece Apr 10, 2024
d5e79e1
Generate installation tests
alephpiece Apr 10, 2024
962a9cb
Update spack package, use cmake preset to test antmoc
alephpiece Apr 11, 2024
7d64697
Add valgrind
alephpiece Apr 11, 2024
e5cb3ae
Add gcovr, fix valgrind version
alephpiece Apr 11, 2024
e0acd57
Add libc6-dbg for valgrind
alephpiece Apr 12, 2024
8c8780a
Clean up test history
alephpiece Apr 12, 2024
f6c14fb
Update package
alephpiece Apr 12, 2024
73bf1b1
Add OCI labels
alephpiece Apr 12, 2024
08952d3
Update github actions
alephpiece Apr 12, 2024
8e20216
Remove an unused argument
alephpiece Apr 13, 2024
9d1a7e8
Update .gitignore
alephpiece May 1, 2024
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
36 changes: 17 additions & 19 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,54 @@ on:
push:
tags:
- 'v*'
pull_request:

jobs:
main:
build:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
-
name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1
uses: crazy-max/ghaction-docker-meta@v5
with:
images: antmoc/antmoc-ci
tag-semver: |
{{version}}
{{major}}.{{minor}}
images: |
antmoc/antmoc-ci
tags: |
type=semver,pattern={{version}}
-
name: Prepare arguments
id: prep
run: |
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=vcs_url::$(git config --get remote.origin.url)
echo ::set-output name=vcs_ref::$(git rev-parse --short HEAD)
echo ::set-output name=oci_created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=oci_source::$(git config --get remote.origin.url)
echo ::set-output name=oci_revision::$(git rev-parse --short HEAD)
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
-
name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
build-args: |
BUILD_DATE=${{ steps.prep.outputs.created }}
VCS_URL=${{ steps.prep.outputs.vcs_url }}
VCS_REF=${{ steps.prep.outputs.vcs_ref }}
OCI_CREATED=${{ steps.prep.outputs.oci_created }}
OCI_SOURCE=${{ steps.prep.outputs.oci_source }}
OCI_REVISION=${{ steps.prep.outputs.oci_revision }}
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__pycache__/
/mirror
/mirror/
/ant-moc/
/antmoc/
.spack-env/
spack.lock
Loading