From 0f02edcbdddb059ac312094ed09e4e5b1e8a9364 Mon Sep 17 00:00:00 2001
From: Matthias Diener <mdiener@illinois.edu>
Date: Wed, 17 Mar 2021 14:23:12 -0500
Subject: [PATCH] conda env file

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0068af33..4e69bead 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,15 +85,17 @@ jobs:
                 cd "$DOWNSTREAM_PROJECT"
                 echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)"
                 sed -i "/egg=grudge/ c git+file://$(readlink -f ..)#egg=grudge" requirements.txt
-                export CONDA_ENVIRONMENT=.test-conda-env-py3.yml
                 # Avoid slow or complicated tests in downstream projects
                 export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'"
                 if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then
                     # can't turn off MPI in mirgecom
                     sudo apt-get update
                     sudo apt-get install openmpi-bin libopenmpi-dev
+                    export CONDA_ENVIRONMENT=conda-env.yml
                 else
                     sed -i "/mpi4py/ d" requirements.txt
+                    export CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+
                 fi
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
                 . ./ci-support.sh
-- 
GitLab