diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8dec8e550fc11326b6e002a52d28bd1f7deb05e..64987fd0b3aad7c9dadb92e43c874687a3b1f220 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,8 +58,8 @@ jobs: - uses: actions/checkout@v2 - name: "Main Script" run: | - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh - . ./ci-support.sh + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 build_py_project_in_conda_env test_py_project @@ -107,7 +107,7 @@ jobs: python-version: '3.x' - name: "Main Script" run: | - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh + curl -L -O https://tiker.net/ci-support-v0 . ci-support.sh build_py_project_in_conda_env conda install graphviz @@ -128,6 +128,9 @@ jobs: env: DOWNSTREAM_PROJECT: ${{ matrix.downstream_project }} run: | + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then git clone "https://github.com/illinois-ceesd/$DOWNSTREAM_PROJECT.git" else @@ -138,7 +141,7 @@ jobs: echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)" # Use this version of arraycontext instead of what downstream would install - sed -i "/egg=arraycontext/ c git+file://$(readlink -f ..)#egg=arraycontext" requirements.txt + edit_requirements_txt_for_downstream_in_subdir # Avoid slow or complicated tests in downstream projects export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'" @@ -153,8 +156,6 @@ jobs: sed -i "/mpi4py/ d" requirements.txt fi - curl -L -O https://tiker.net/ci-support-v0 - . ./ci-support-v0 build_py_project_in_conda_env test_py_project