From 9dcb8639493581fba1dde08f4d9d192882a94859 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 24 Mar 2022 23:06:31 -0500 Subject: [PATCH] Downstream CI: use ci-support, add Gitlab --- .github/workflows/ci.yml | 18 +----------------- .gitlab-ci.yml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a05f47e..14524f3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,23 +110,7 @@ jobs: run: | curl -L -O -k https://tiker.net/ci-support-v0 . ./ci-support-v0 - - git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" - cd "$DOWNSTREAM_PROJECT" - echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)" - - edit_requirements_txt_for_downstream_in_subdir - - # HACK: force overwrite even if it's already there (e.g. as a pyopencl dep) - sed -i '/egg=pytools/ s/^/-e/' requirements.txt - - 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" docs: name: Documentation diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be167b79..f1cbf9c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,3 +67,16 @@ Documentation: tags: - python3 +Downstream: + parallel: + matrix: + - DOWNSTREAM_PROJECT: [loopy, pytato] + 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