@@ -229,13 +229,17 @@ jobs:
229229 timeout-minutes : 20
230230 strategy :
231231 matrix :
232- julia_version :
233- - " 1"
232+ include :
233+ - container : ghcr.io/juliaparallel/github-actions-buildcache:intel-mpi-jq
234+ name : " Intel MPI 2019.9.304"
235+ - container : ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-jq
236+ name : " Intel oneAPI MPI 2021.7.0"
234237
235238 fail-fast : false
236239
237240 runs-on : ubuntu-latest
238- container : ghcr.io/juliaparallel/github-actions-buildcache:intel-mpi-2019.9.304-ecfipz6mxgepmrkwp5dl5oohion5m54r.spack
241+ container : ${{ matrix.container }}
242+ name : " Test ${{ matrix.name }}"
239243
240244 env :
241245 JULIA_MPI_TEST_BINARY : system
@@ -247,57 +251,7 @@ jobs:
247251
248252 - uses : julia-actions/setup-julia@v1
249253 with :
250- version : ${{ matrix.julia_version }}
251-
252- - name : Install jq # Needed for `julia-actions/cache`
253- run : |
254- apt-get update
255- apt-get install -y jq
256-
257- - uses : julia-actions/cache@v1
258- - name : add MPIPreferences
259- shell : julia --color=yes --project=. {0}
260- run : |
261- using Pkg
262- Pkg.develop(path="lib/MPIPreferences")
263-
264- - name : use system MPI
265- run : |
266- julia --color=yes --project=. -e '
267- using MPIPreferences
268- MPIPreferences.use_system_binary()'
269-
270- - uses : julia-actions/julia-runtest@v1
271-
272-
273- test-oneapi-linux :
274- timeout-minutes : 20
275- strategy :
276- matrix :
277- julia_version :
278- - " 1"
279-
280- fail-fast : false
281-
282- runs-on : ubuntu-latest
283- container : ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-gzc7es2p27ftwyk4sdplynlj6d54xzi6.spack
284-
285- env :
286- JULIA_MPI_TEST_BINARY : system
287- JULIA_MPI_TEST_ABI : MPICH
288-
289- steps :
290- - name : Checkout
291- uses : actions/checkout@v4
292-
293- - uses : julia-actions/setup-julia@v1
294- with :
295- version : ${{ matrix.julia_version }}
296-
297- - name : Install jq # Needed for `julia-actions/cache`
298- run : |
299- apt-get update
300- apt-get install -y jq
254+ version : " 1"
301255
302256 - uses : julia-actions/cache@v1
303257 - name : add MPIPreferences
@@ -503,7 +457,7 @@ jobs:
503457 fail-fast : false
504458
505459 runs-on : ubuntu-latest
506- container : ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-gzc7es2p27ftwyk4sdplynlj6d54xzi6.spack
460+ container : ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-jq
507461
508462 env :
509463 JULIA_MPI_TEST_BINARY : MPItrampoline_jll
@@ -520,8 +474,7 @@ jobs:
520474 - name : Build MPIwrapper
521475 run : |
522476 apt-get update
523- # jq is needed for `julia-actions/cache`
524- apt-get install -y wget cmake gcc g++ gfortran python3 jq
477+ apt-get install -y wget cmake gcc g++ gfortran python3
525478 wget https://github.com/eschnett/MPIwrapper/archive/refs/tags/v${MPIWrapper}.tar.gz
526479 tar xzf v${MPIWrapper}.tar.gz
527480 cd MPIwrapper-*
@@ -563,13 +516,15 @@ jobs:
563516 timeout-minutes : 20
564517 strategy :
565518 matrix :
566- julia_version :
567- - " 1"
519+ include :
520+ - container : ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-jq
521+ name : " MVAPICH 2.3.7"
568522
569523 fail-fast : false
570524
571525 runs-on : ubuntu-22.04
572- container : ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-2.3.7-1-hs7gkcclsnk55kqm52a4behdnt3dug6b.spack
526+ container : ${{ matrix.container }}
527+ name : " Test ${{ matrix.name }}"
573528
574529 env :
575530 JULIA_MPI_TEST_BINARY : system
@@ -582,12 +537,7 @@ jobs:
582537
583538 - uses : julia-actions/setup-julia@v1
584539 with :
585- version : ${{ matrix.julia_version }}
586-
587- - name : Install jq # Needed for `julia-actions/cache`
588- run : |
589- apt-get update
590- apt-get install -y jq
540+ version : " 1"
591541
592542 - uses : julia-actions/cache@v1
593543 - name : add MPIPreferences
0 commit comments