Skip to content

Commit b3d22b1

Browse files
committed
Use edit_requirements_txt_for_downstream_in_subdir for downstream CI
1 parent 1db13f2 commit b3d22b1

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
- uses: actions/checkout@v2
5959
- name: "Main Script"
6060
run: |
61-
curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
62-
. ./ci-support.sh
61+
curl -L -O https://tiker.net/ci-support-v0
62+
. ./ci-support-v0
6363
build_py_project_in_conda_env
6464
test_py_project
6565
@@ -107,7 +107,7 @@ jobs:
107107
python-version: '3.x'
108108
- name: "Main Script"
109109
run: |
110-
curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
110+
curl -L -O https://tiker.net/ci-support-v0
111111
. ci-support.sh
112112
build_py_project_in_conda_env
113113
conda install graphviz
@@ -128,6 +128,9 @@ jobs:
128128
env:
129129
DOWNSTREAM_PROJECT: ${{ matrix.downstream_project }}
130130
run: |
131+
curl -L -O https://tiker.net/ci-support-v0
132+
. ./ci-support-v0
133+
131134
if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then
132135
git clone "https://github.com/illinois-ceesd/$DOWNSTREAM_PROJECT.git"
133136
else
@@ -138,7 +141,7 @@ jobs:
138141
echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)"
139142
140143
# Use this version of arraycontext instead of what downstream would install
141-
sed -i "/egg=arraycontext/ c git+file://$(readlink -f ..)#egg=arraycontext" requirements.txt
144+
edit_requirements_txt_for_downstream_in_subdir
142145
143146
# Avoid slow or complicated tests in downstream projects
144147
export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'"
@@ -153,8 +156,6 @@ jobs:
153156
sed -i "/mpi4py/ d" requirements.txt
154157
fi
155158
156-
curl -L -O https://tiker.net/ci-support-v0
157-
. ./ci-support-v0
158159
build_py_project_in_conda_env
159160
test_py_project
160161

0 commit comments

Comments
 (0)