diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6b09501b9547d37fddf2552c9f0a6aed08e4330..3090b902d9899249113498d70a12648750f5d20c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,13 +101,15 @@ Python 3 Intel Examples: Python 3 Conda: script: | - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + CONDA_ENVIRONMENT=.test-conda-env.yml + grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh Python 3 Conda Examples: script: | - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + CONDA_ENVIRONMENT=.test-conda-env.yml + grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh build_py_project_in_conda_env