Skip to content
Snippets Groups Projects
Commit d98bcd01 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Revert "Add bogus option to configure.py in github CI to see whether it's being run"

This reverts commit 53e5afcd.
parent 53e5afcd
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ jobs: ...@@ -34,7 +34,7 @@ jobs:
sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
CONDA_ENVIRONMENT=.test-conda-env-py2.yml CONDA_ENVIRONMENT=.test-conda-env-py2.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib" --yoink python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib"
. ./build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh
pytest3: pytest3:
...@@ -46,7 +46,7 @@ jobs: ...@@ -46,7 +46,7 @@ jobs:
run: | run: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml CONDA_ENVIRONMENT=.test-conda-env-py3.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib" --yoink python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib"
. ./build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh
# vim: sw=4 # vim: sw=4
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment