diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7040e651018c609b9e865e3cd3f219b3dbcc3a52..6366798384df4edb3225481f06f982dded1a5855 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,19 +88,6 @@ jobs: run: | curl -L -O https://tiker.net/ci-support-v0 . ./ci-support-v0 - if [[ "$DOWNSTREAM_PROJECT" = "pytential" ]] && [[ "$GITHUB_HEAD_REF" = "wrangler-refactor" ]]; then - git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" -b "wrangler-refactor" - else - git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" - fi - cd "$DOWNSTREAM_PROJECT" - echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)" - transfer_requirements_git_urls ../requirements.txt ./requirements.txt - edit_requirements_txt_for_downstream_in_subdir - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - # Avoid slow or complicated tests in downstream projects - export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'" - build_py_project_in_conda_env - test_py_project + test_downstream "$DOWNSTREAM_PROJECT" # vim: sw=4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0df3735877eb64df47cdfa842737669212b19dcd..6a79583bc15e9b42512242790058dbfac2838ab6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,3 +140,17 @@ Benchmarks: - benchmark except: - tags + +Downstream: + parallel: + matrix: + - DOWNSTREAM_PROJECT: [pytential] + tags: + - large-node + - "docker-runner" + script: | + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + test_downstream "$DOWNSTREAM_PROJECT" + +# vim: sw=2