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

Merge branch 'remove-hwloc-meddling-on-conda-gitlab' into 'master'

Remove hwloc processing for Conda Gitlab CI

See merge request inducer/grudge!96
parents eb653a1e e89669f5
No related branches found
No related tags found
1 merge request!96Remove hwloc processing for Conda Gitlab CI
Pipeline #130542 passed
......@@ -67,8 +67,7 @@ Python 3 Conda:
- linux
- large-node
script: |
CONDA_ENVIRONMENT=.test-conda-env.yml
grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT
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
# Shut up ibverbs about fork(), e.g. https://gitlab.tiker.net/inducer/grudge/-/jobs/220796
......@@ -81,8 +80,7 @@ Python 3 Conda Examples:
- linux
- large-node
script: |
CONDA_ENVIRONMENT=.test-conda-env.yml
grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
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
......
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