diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c420c002eedf2fe4a8901d475882347fe6f6a15..9d83cd3bb7259d5ed1b3961908d38c0e39ded701 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,8 +118,7 @@ jobs: downstream_tests: strategy: matrix: - #downstream_project: [meshmode, grudge, pytential, mirgecom] - downstream_project: [meshmode, grudge, mirgecom] + downstream_project: [meshmode, grudge, mirgecom, mirgecom_examples] fail-fast: false name: Tests for downstream project ${{ matrix.downstream_project }} @@ -132,33 +131,7 @@ jobs: run: | curl -L -O https://tiker.net/ci-support-v0 . ./ci-support-v0 - - if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then - git clone "https://github.com/illinois-ceesd/$DOWNSTREAM_PROJECT.git" - else - git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" - fi - - cd "$DOWNSTREAM_PROJECT" - echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)" - - # Use this version of arraycontext instead of what downstream would install - edit_requirements_txt_for_downstream_in_subdir - - # 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 - export CONDA_ENVIRONMENT=conda-env.yml - export CISUPPORT_PARALLEL_PYTEST=no - echo "- mpi4py" >> "$CONDA_ENVIRONMENT" - else - sed -i "/mpi4py/ d" requirements.txt - fi - - build_py_project_in_conda_env - test_py_project + test_downstream "$DOWNSTREAM_PROJECT" if [[ "$DOWNSTREAM_PROJECT" = "meshmode" ]]; then python ../examples/simple-dg.py --lazy diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31e5eace82dcead91cc3ab723b20ea52ac756eb8..a321fa4489fbc9ae5336d0995ff892bc5aa35c52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,3 +92,19 @@ Mypy: - python3 except: - tags + +Downstream: + parallel: + matrix: + - DOWNSTREAM_PROJECT: [meshmode, grudge, mirgecom, mirgecom_examples] + tags: + - large-node + - "docker-runner" + script: | + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + test_downstream "$DOWNSTREAM_PROJECT" + + if [[ "$DOWNSTREAM_PROJECT" = "meshmode" ]]; then + python ../examples/simple-dg.py --lazy + fi