From cc727523589c973957cc4da61b4f60798de3fd34 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner <inform@tiker.net> Date: Thu, 24 Mar 2022 17:06:25 -0500 Subject: [PATCH] Downstream CI: use ci-support, add Gitlab --- .github/workflows/ci.yml | 24 +----------------------- .gitlab-ci.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6adf4a6d3..83f38e666 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,29 +143,7 @@ jobs: run: | curl -L -O https://tiker.net/ci-support-v0 . ./ci-support-v0 - - # Use "special grudge" for kcv3 and branches targeting it. - if [[ "$DOWNSTREAM_PROJECT" = "grudge" ]] && [[ "$GITHUB_HEAD_REF" = "kernel_callables_v3-edit2" || "$GITHUB_BASE_REF" = "kernel_callables_v3-edit2" ]]; then - with_echo git clone "https://github.com/kaushikcfd/$DOWNSTREAM_PROJECT.git" -b "kcv3-e2-compat" - else - with_echo git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" - fi - cd "$DOWNSTREAM_PROJECT" - echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)" - - if [[ "$DOWNSTREAM_PROJECT" = "pytential" ]] && [[ "$GITHUB_HEAD_REF" = "kernel_callables_v3-edit2" || "$GITHUB_BASE_REF" = "kernel_callables_v3-edit2" ]]; then - sed -i "/egg=sumpy/ c git+https://github.com/inducer/sumpy.git@loopy-callables#egg=sumpy" requirements.txt - fi - - transfer_requirements_git_urls ../requirements.txt ./requirements.txt - sed -i "/egg=loopy/ c git+file://$(readlink -f ..)#egg=loopy" requirements.txt - sed -i "/mpi4py/ d" requirements.txt - - # 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" downstream_firedrake: name: Tests for downstream project Firedrake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55d392712..b754829d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -185,3 +185,15 @@ Benchmarks: - benchmark except: - tags + +Downstream: + parallel: + matrix: + - DOWNSTREAM_PROJECT: [meshmode, grudge, pytential, pytato] + tags: + - large-node + - "docker-runner" + script: | + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + test_downstream "$DOWNSTREAM_PROJECT" -- GitLab