Set specific spack version, swap to ompi versions supported

sandialabs · Nov 13, 2024 · 95bca5d · 95bca5d
1 parent a1a3793
commit 95bca5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
@@ -3,14 +3,14 @@ services:
     image: "bootstrap"
     build:
       dockerfile_inline: |
-        FROM spack/ubuntu-jammy:latest
+        FROM spack/ubuntu-jammy:0.22.2
         VOLUME /configs
         ARG OMPI_VERSION
         ENV OMPI_VERSION=$${OMPI_VERSION}
         CMD cp /configs/spack.yaml . && \
             spack -e . add openmpi@$${OMPI_VERSION} && \
             spack -e . containerize >/configs/spack.Dockerfile && \
-            sed -i -e 's/spack install/spack external find --all --not-buildable \&\& spack install/;' /configs/spack.Dockerfile
+            sed -i -e 's/spack install/spack info openmpi \&\& spack -d install/;' /configs/spack.Dockerfile
       args:
         OMPI_VERSION: main
       no_cache: true

diff --git a/.github/spack.yaml b/.github/spack.yaml
@@ -11,7 +11,7 @@ spack:
     strip: false
     images:
       os: ubuntu:22.04
-      spack: latest
+      spack: 0.22.2
     os_packages:
       build:
         - build-essential

diff --git a/.github/workflows/ci_checks.yaml b/.github/workflows/ci_checks.yaml
@@ -15,7 +15,8 @@ jobs:
       matrix:
         ompi_version:
           - main
-          - 5.0.5
+          - 5.0.3
+          - git.v5.0.x
 
     steps:
       - name: Checkout repository