From aac4bc762a4e73480e9ea79e9e982badc32ca7cd 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 4c6b9a2d9..a3eb82ecf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,4 +132,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 55b12440bacdf0f87fad624f75c4592dc18c8a4b 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 a3eb82ecf..a7bb9ace7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,10 +130,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 ccf501e46550afaeb9e9493048a7696b55eadafe 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 a7bb9ace7..12e663823 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,6 +132,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 22f71932eb0e50a5fcb4ee488a7d1c9ec674a483 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 12e663823..4503ae9b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,12 +134,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 de84ea531c187a52fa3be1837c29bc12edcceade Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 2 Mar 2022 15:04:22 -0600 Subject: [PATCH 5/5] only test examples for mirgecom --- .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 4503ae9b7..ac2f4e942 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,9 +133,11 @@ jobs: if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then # Test main branch + # Only test examples, not pytest tests, as those take too much time. examples/run_examples.sh ./examples + else + test_py_project fi - test_py_project # vim: sw=4