Skip to content

Commit 3851911

Browse files
committed
Merge remote-tracking branch 'origin/main' into generic-part-bdry
2 parents 697c371 + 488b613 commit 3851911

14 files changed

Lines changed: 785 additions & 330 deletions

File tree

.ci/install-downstream.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
downstream_tests:
128128
strategy:
129129
matrix:
130-
downstream_project: [grudge, pytential, mirgecom]
130+
downstream_project: [grudge, pytential, mirgecom, mirgecom_examples]
131131
name: Tests for downstream project ${{ matrix.downstream_project }}
132132
runs-on: ubuntu-latest
133133
steps:
@@ -138,23 +138,6 @@ jobs:
138138
run: |
139139
curl -L -O https://tiker.net/ci-support-v0
140140
. ./ci-support-v0
141-
source .ci/install-downstream.sh
142-
build_py_project_in_conda_env
143-
test_py_project
144-
145-
mirgecom_examples:
146-
runs-on: ubuntu-latest
147-
name: Examples for downstream project mirgecom
148-
steps:
149-
- uses: actions/checkout@v2
150-
- name: "Main Script"
151-
env:
152-
DOWNSTREAM_PROJECT: mirgecom
153-
run: |
154-
curl -L -O https://tiker.net/ci-support-v0
155-
. ./ci-support-v0
156-
source .ci/install-downstream.sh
157-
build_py_project_in_conda_env
158-
examples/run_examples.sh ./examples
141+
test_downstream "$DOWNSTREAM_PROJECT"
159142
160143
# vim: sw=4

.gitlab-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,17 @@ Pylint:
111111
- python3
112112
except:
113113
- tags
114+
115+
Downstream:
116+
parallel:
117+
matrix:
118+
- DOWNSTREAM_PROJECT: [grudge, pytential, mirgecom, mirgecom_examples]
119+
tags:
120+
- large-node
121+
- "docker-runner"
122+
script: |
123+
curl -L -O https://tiker.net/ci-support-v0
124+
. ./ci-support-v0
125+
test_downstream "$DOWNSTREAM_PROJECT"
126+
127+
# vim: sw=2

0 commit comments

Comments
 (0)