Skip to content

Commit 6624d1b

Browse files
committed
more CI updates
1 parent b2d91cc commit 6624d1b

File tree

1 file changed

+18
-31
lines changed

1 file changed

+18
-31
lines changed

.github/workflows/UnitTests.yml

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,6 @@ jobs:
235235

236236
runs-on: windows-latest
237237

238-
env:
239-
JULIA_MPI_BINARY: system
240-
JULIA_MPIEXEC: "C:\\Program Files\\Microsoft MPI\\Bin\\mpiexec"
241-
242238
steps:
243239
- name: Cancel Previous Runs
244240
uses: styfle/[email protected]
@@ -260,18 +256,15 @@ jobs:
260256
with:
261257
version: ${{ matrix.julia_version }}
262258

263-
# https://discourse.julialang.org/t/recommendation-cache-julia-artifacts-in-ci-services/35484
264-
- name: Cache artifacts
265-
uses: actions/cache@v1
266-
env:
267-
cache-name: cache-artifacts
268-
with:
269-
path: ~/.julia/artifacts
270-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
271-
restore-keys: |
272-
${{ runner.os }}-test-${{ env.cache-name }}-
273-
${{ runner.os }}-test-
274-
${{ runner.os }}-
259+
- uses: julia-actions/cache@v1
260+
261+
- name: add MPIPreferences, use system
262+
shell: julia --color=yes --project=test {0}
263+
run: |
264+
using Pkg
265+
Pkg.develop(path="lib/MPIPreferences")
266+
using MPIPreferences
267+
MPIPreferences.use_system_binary(export_prefs=true)
275268
276269
- uses: julia-actions/julia-buildpkg@latest
277270
- uses: julia-actions/julia-runtest@latest
@@ -300,9 +293,6 @@ jobs:
300293

301294
runs-on: ${{ matrix.os }}
302295

303-
env:
304-
JULIA_MPI_BINARY: MPItrampoline_jll
305-
306296
steps:
307297
- name: Cancel Previous Runs
308298
uses: styfle/[email protected]
@@ -316,18 +306,15 @@ jobs:
316306
with:
317307
version: ${{ matrix.julia_version }}
318308

319-
# https://discourse.julialang.org/t/recommendation-cache-julia-artifacts-in-ci-services/35484
320-
- name: Cache artifacts
321-
uses: actions/cache@v1
322-
env:
323-
cache-name: cache-artifacts
324-
with:
325-
path: ~/.julia/artifacts
326-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
327-
restore-keys: |
328-
${{ runner.os }}-test-${{ env.cache-name }}-
329-
${{ runner.os }}-test-
330-
${{ runner.os }}-
309+
- uses: julia-actions/cache@v1
310+
311+
- name: add MPIPreferences, use system
312+
shell: julia --color=yes --project=test {0}
313+
run: |
314+
using Pkg
315+
Pkg.develop(path="lib/MPIPreferences")
316+
using MPIPreferences
317+
MPIPreferences.use_jll_binary("MPItrampoline", export_prefs=true)
331318
332319
- uses: julia-actions/julia-buildpkg@latest
333320
- uses: julia-actions/julia-runtest@latest

0 commit comments

Comments
 (0)