[CI] Run tests with MVAPICH 3.0b and update other Spack containers

JuliaParallel · Feb 1, 2024 · dd6b122 · dd6b122
1 parent 25e1150
commit dd6b122
Showing 1 changed file with 17 additions and 54 deletions.
diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml
@@ -229,13 +229,17 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        julia_version:
-          - "1"
+        include:
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:intel-mpi-2019.9.304-jfuqjh3uxc26ogeei67rnxdrnwl6cjzj.spack
+            name: "Intel MPI 2019.9.304"
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-varyrfm6dqsfqf5vemxpgkipytjutnc3.spack
+            name: "Intel oneAPI MPI 2021.7.0"
 
       fail-fast: false
 
     runs-on: ubuntu-latest
-    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-mpi-2019.9.304-ecfipz6mxgepmrkwp5dl5oohion5m54r.spack
+    container: ${{ matrix.container }}
+    name: "Test ${{ matrix.name }}"
 
     env:
       JULIA_MPI_TEST_BINARY: system
@@ -247,52 +251,7 @@ jobs:
 
     - uses: julia-actions/setup-julia@v1
       with:
-        version: ${{ matrix.julia_version }}
-
-    - name: Install jq # Needed for `julia-actions/cache`
-      run: |
-        apt-get update
-        apt-get install -y jq
-
-    - uses: julia-actions/cache@v1
-    - name: add MPIPreferences
-      shell: julia --color=yes --project=. {0}
-      run: |
-        using Pkg
-        Pkg.develop(path="lib/MPIPreferences")
-
-    - name: use system MPI
-      run: |
-        julia --color=yes --project=. -e '
-          using MPIPreferences
-          MPIPreferences.use_system_binary()'
-
-    - uses: julia-actions/julia-runtest@v1
-
-
-  test-oneapi-linux:
-    timeout-minutes: 20
-    strategy:
-      matrix:
-        julia_version:
-          - "1"
-
-      fail-fast: false
-
-    runs-on: ubuntu-latest
-    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-gzc7es2p27ftwyk4sdplynlj6d54xzi6.spack
-
-    env:
-      JULIA_MPI_TEST_BINARY: system
-      JULIA_MPI_TEST_ABI: MPICH
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - uses: julia-actions/setup-julia@v1
-      with:
-        version: ${{ matrix.julia_version }}
+        version: "1"
 
     - name: Install jq # Needed for `julia-actions/cache`
       run: |
@@ -503,7 +462,7 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-latest
-    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-gzc7es2p27ftwyk4sdplynlj6d54xzi6.spack
+    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-varyrfm6dqsfqf5vemxpgkipytjutnc3.spack
 
     env:
       JULIA_MPI_TEST_BINARY: MPItrampoline_jll
@@ -563,13 +522,17 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        julia_version:
-          - "1"
+        include:
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-2.3.7-1-ojtmxkiwgjud7quao53hcpatvsaburma.spack
+            name: "MVAPICH 2.3.7"
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich-3.0b-psfd7u2m56k3qt5zmiikhqp6tgjs2qy6.spack
+            name: "MVAPICH 3.0b"
 
       fail-fast: false
 
     runs-on: ubuntu-22.04
-    container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-2.3.7-1-hs7gkcclsnk55kqm52a4behdnt3dug6b.spack
+    container: ${{ matrix.container }}
+    name: "Test ${{ matrix.name }}"
 
     env:
       JULIA_MPI_TEST_BINARY: system
@@ -582,7 +545,7 @@ jobs:
 
     - uses: julia-actions/setup-julia@v1
       with:
-        version: ${{ matrix.julia_version }}
+        version: "1"
 
     - name: Install jq # Needed for `julia-actions/cache`
       run: |