Skip to content

Commit 7aa3dd8

Browse files
committed
Downstream CI: use ci-support, add Gitlab
1 parent 5b2a569 commit 7aa3dd8

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,6 @@ jobs:
8888
run: |
8989
curl -L -O https://tiker.net/ci-support-v0
9090
. ./ci-support-v0
91-
if [[ "$DOWNSTREAM_PROJECT" = "pytential" ]] && [[ "$GITHUB_HEAD_REF" = "wrangler-refactor" ]]; then
92-
git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" -b "wrangler-refactor"
93-
else
94-
git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git"
95-
fi
96-
cd "$DOWNSTREAM_PROJECT"
97-
echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)"
98-
transfer_requirements_git_urls ../requirements.txt ./requirements.txt
99-
edit_requirements_txt_for_downstream_in_subdir
100-
export CONDA_ENVIRONMENT=.test-conda-env-py3.yml
101-
# Avoid slow or complicated tests in downstream projects
102-
export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'"
103-
build_py_project_in_conda_env
104-
test_py_project
91+
test_downstream "$DOWNSTREAM_PROJECT"
10592
10693
# vim: sw=4

.gitlab-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,17 @@ Benchmarks:
140140
- benchmark
141141
except:
142142
- tags
143+
144+
Downstream:
145+
parallel:
146+
matrix:
147+
- DOWNSTREAM_PROJECT: [pytential]
148+
tags:
149+
- large-node
150+
- "docker-runner"
151+
script: |
152+
curl -L -O https://tiker.net/ci-support-v0
153+
. ./ci-support-v0
154+
test_downstream "$DOWNSTREAM_PROJECT"
155+
156+
# vim: sw=2

0 commit comments

Comments
 (0)