From 1498413de9c423fb4caf27ded82124257ad9e42a Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 2 Mar 2022 09:20:50 -0600 Subject: [PATCH 1/5] also test mirgecom examples in CI --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef2f5c091..c86a90f83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,4 +129,8 @@ jobs: build_py_project_in_conda_env test_py_project + if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then + examples/run_examples.sh ./examples + fi + # vim: sw=4 From 7494c8572af6bc04ed6e2b9c97f647499d0d4ee4 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 2 Mar 2022 10:05:56 -0600 Subject: [PATCH 2/5] reorder --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c86a90f83..e5aae978a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,10 +127,11 @@ jobs: sed -i "/mpi4py/ d" requirements.txt fi build_py_project_in_conda_env - test_py_project if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then examples/run_examples.sh ./examples fi + test_py_project + # vim: sw=4 From c441933ca1ff03216cc19a0dfcc1e3c0d9872540 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 2 Mar 2022 11:13:38 -0600 Subject: [PATCH 3/5] also test production --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5aae978a..5d7ac1c50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,6 +129,13 @@ jobs: build_py_project_in_conda_env if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then + # Test main branch + examples/run_examples.sh ./examples + + # Test production branch + curl -O -L https://raw.githubusercontent.com/illinois-ceesd/emirge/main/switch-mirgecom.sh + chmod a+x switch-mirgecom.sh + ./switch-mirgecom.sh prod examples/run_examples.sh ./examples fi From 3174e73e8d4ce9846a5e8e0f883ea9e2ba2df276 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 2 Mar 2022 11:21:09 -0600 Subject: [PATCH 4/5] remove production test (won't work without emirge) --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d7ac1c50..3914b93c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,12 +131,6 @@ jobs: if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then # Test main branch examples/run_examples.sh ./examples - - # Test production branch - curl -O -L https://raw.githubusercontent.com/illinois-ceesd/emirge/main/switch-mirgecom.sh - chmod a+x switch-mirgecom.sh - ./switch-mirgecom.sh prod - examples/run_examples.sh ./examples fi test_py_project From 8a6d232c3884d050d3c1c775aeb36a6127db57c3 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 2 Mar 2022 12:15:19 -0600 Subject: [PATCH 5/5] also test production drivers --- .github/workflows/ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3914b93c7..871727e23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,13 +126,21 @@ jobs: else sed -i "/mpi4py/ d" requirements.txt fi + build_py_project_in_conda_env + test_py_project + cd .. if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then # Test main branch examples/run_examples.sh ./examples + + # Test production drivers + source .ci_support/production_testing_env.sh + source .ci_support/merge-install-production-branch.sh . + source .ci_support/production-drivers-install.sh . + source .ci_support/production-drivers-run.sh . fi - test_py_project # vim: sw=4