From 468be01e06dd13bcf84c02f5cf5ab5cf6de1cebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 14 Feb 2021 22:31:36 +0100 Subject: [PATCH 1/2] Remove hwloc processing for Conda Gitlab CI --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e429755..f2f4ff75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,6 @@ Python 3 Conda: - large-node script: | 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 # Shut up ibverbs about fork(), e.g. https://gitlab.tiker.net/inducer/grudge/-/jobs/220796 @@ -82,7 +81,6 @@ Python 3 Conda Examples: - large-node script: | 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 -- GitLab From e89669f5a10fda3ea28f0ec853dbc628bc6dfb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 14 Feb 2021 22:45:48 +0100 Subject: [PATCH 2/2] Fix name of conda env for Gitlab CI --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2f4ff75..96e468c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,7 @@ Python 3 Conda: - linux - large-node script: | - CONDA_ENVIRONMENT=.test-conda-env.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 # Shut up ibverbs about fork(), e.g. https://gitlab.tiker.net/inducer/grudge/-/jobs/220796 @@ -80,7 +80,7 @@ Python 3 Conda Examples: - linux - large-node script: | - CONDA_ENVIRONMENT=.test-conda-env.yml + 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 -- GitLab