fixup! ci: add mgard dependency to spack builds

ornladios · Aug 14, 2023 · 4479eda · 4479eda
1 parent 7d12642
commit 4479eda
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
@@ -108,7 +108,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
+      image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-${{ matrix.compiler }}
       options: --shm-size=1g
       env:
         GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}

diff --git a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang
@@ -1,4 +1,4 @@
-FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
+FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-base
 ARG CLANG_VERSION=10
 
 RUN apt-get update && apt-get install -y \

diff --git a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc
@@ -1,4 +1,4 @@
-FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
+FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-base
 ARG GCC_VERSION=8
 
 RUN apt-get update && apt-get install -y \

diff --git a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel
@@ -1,4 +1,4 @@
-FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
+FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-base
 
 RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg && \
     echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \

diff --git a/scripts/ci/images/build-ubuntu.sh b/scripts/ci/images/build-ubuntu.sh
@@ -3,25 +3,25 @@
 set -ex
 
 # Build the base image
-docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base .
+docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-base .
 
 # Which is also the gcc11 image
-docker tag ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
+docker tag ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-base ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc11
 
 # Build the gcc8, gcc9, and gcc10 images
-docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 .
-docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 .
-docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 .
+docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc8 .
+docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc9 .
+docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc10 .
 
 # Build the clang6 and clang10 images
-docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6 .
-docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 .
+docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-clang6 .
+docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-clang10 .
 
 # Push images to github container registry
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
-docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-base
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc8
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc9
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc10
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-gcc11
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-clang6
+docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-tmp-clang10