From dcd60934bc9334b856fc8005fd025f00372c0323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 28 May 2021 12:37:35 -0500 Subject: [PATCH 1/4] Add grudge examples to downstream CI --- .github/workflows/ci.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bc5afc..d54d62a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,14 +101,19 @@ jobs: downstream_tests: strategy: matrix: - downstream_project: [leap] - name: Tests for downstream project ${{ matrix.downstream_project }} + include: + - downstream_project: leap + run_what: tests + - downstream_project: grudge + run_what: examples + name: Run ${{ matrix.run_what }} for downstream project ${{ matrix.downstream_project }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: "Main Script" env: DOWNSTREAM_PROJECT: ${{ matrix.downstream_project }} + RUN_WHAT: ${{ matrix.run_what }} run: | git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" cd "$DOWNSTREAM_PROJECT" @@ -122,6 +127,13 @@ jobs: curl -L -O -k https://tiker.net/ci-support-v0 . ./ci-support-v0 build_py_project_in_venv - test_py_project + if test "$RUN_WHAT" = "tests"; then + test_py_project + elif test "$RUN_WHAT" = "examples"; then + run_examples + else + echo "Value $RUN_WHAT of RUN_WHAT not understood." + exit 1 + fi # vim: sw=4 From 916e352f9f08953fc77fe15342aa5bf7a03963b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 28 May 2021 12:40:55 -0500 Subject: [PATCH 2/4] Also run leap examples in downstream CI --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d54d62a..ee237b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,11 +101,13 @@ jobs: downstream_tests: strategy: matrix: - include: - - downstream_project: leap - run_what: tests + downstream_project: [leap, grudge] + run_what: [tests, examples] + exclude: + # no need, no leap dependency - downstream_project: grudge - run_what: examples + run_what: tests + name: Run ${{ matrix.run_what }} for downstream project ${{ matrix.downstream_project }} runs-on: ubuntu-latest steps: From b04bc82db8c206e47b8de6c4077a301b1abec565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 28 May 2021 12:45:48 -0500 Subject: [PATCH 3/4] Tweak downstream test environments --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee237b8..94c2ce0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,6 +100,7 @@ jobs: downstream_tests: strategy: + fail-fast: false matrix: downstream_project: [leap, grudge] run_what: [tests, examples] @@ -128,7 +129,15 @@ jobs: curl -L -O -k https://tiker.net/ci-support-v0 . ./ci-support-v0 - build_py_project_in_venv + + if test -f .test-conda-env-py3.yml; then + CONDA_ENVIRONMENT=.test-conda-env-py3.yml + build_py_project_in_conda_env + else + EXTRA_INSTALL="numpy matplotlib scipy" + build_py_project_in_venv + fi + if test "$RUN_WHAT" = "tests"; then test_py_project elif test "$RUN_WHAT" = "examples"; then From 63cc7a3beeec20652bed0d53e3bad9b86b265949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 28 May 2021 12:53:51 -0500 Subject: [PATCH 4/4] Install MPI for grudge examples downstream CI --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94c2ce0..dda8b4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,6 +131,9 @@ jobs: . ./ci-support-v0 if test -f .test-conda-env-py3.yml; then + sudo apt-get update + sudo apt-get install openmpi-bin libopenmpi-dev + CONDA_ENVIRONMENT=.test-conda-env-py3.yml build_py_project_in_conda_env else