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

Remove hwloc adjustment from conda env

parent 04860289
No related branches found
No related tags found
1 merge request!83Add Conda and Conda Examples jobs on Gitlab CI
Pipeline #49947 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
.gitlab-ci.yml
+ 4
− 2
View file @ ecf0af45
...@@ -101,13 +101,15 @@ Python 3 Intel Examples: ...@@ -101,13 +101,15 @@ Python 3 Intel Examples:
Python 3 Conda: Python 3 Conda:
script: | 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 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 . ./build-and-test-py-project-within-miniconda.sh
Python 3 Conda Examples: Python 3 Conda Examples:
script: | 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 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
. ci-support.sh . ci-support.sh
build_py_project_in_conda_env build_py_project_in_conda_env
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment