From 29134bc4daf7f0d0ddb8bf4b1a35993541cd4da9 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 14 Jul 2020 18:19:51 -0500
Subject: [PATCH] Refactor Github test scripts (not just) for MPI dependency
---
.github/workflows/ci.yml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c3cb8006..d1506751 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,8 +31,9 @@ jobs:
- uses: actions/checkout@v2
- name: "Main Script"
run: |
- grep -v mpi4py .test-conda-env-py3.yml > .test-conda-env.yml
- CONDA_ENVIRONMENT=.test-conda-env.yml
+ sudo apt-get update
+ sudo apt-get install openmpi-bin libopenmpi-dev
+ CONDA_ENVIRONMENT=.test-conda-env-py3.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
@@ -45,12 +46,10 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install openmpi-bin libopenmpi-dev
- grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-within-miniconda.sh
- . ./build-py-project-within-miniconda.sh
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/run-examples.sh
- . ./run-examples.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+ build_py_project_in_conda_env
+ run_examples
# vim: sw=4
--
GitLab